summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Don't create a new functor if old one exists" into jb-devChris Craik2012-05-021-3/+13
|\
| * Don't create a new functor if old one existsChris Craik2012-05-021-3/+13
| | | | | | | | | | bug:6405861 Change-Id: Ife0dcc6416b18bbd50b4d244e6464f423f651de6
* | Merge "Workaround a crash" into jb-devTeng-Hui Zhu2012-05-021-2/+8
|\ \
| * | Workaround a crashTeng-Hui Zhu2012-05-011-2/+8
| | | | | | | | | | | | | | | | | | | | | When content is empty, just minus an empty rect. bug:6404975 Change-Id: Ia12a64f93345bde7d3b92a99746b29e2e71bb652
* | | Merge "Fix max texture setup" into jb-devTeng-Hui Zhu2012-05-023-62/+58
|\ \ \ | |_|/ |/| |
| * | Fix max texture setupTeng-Hui Zhu2012-05-013-62/+58
| | | | | | | | | | | | | | | | | | bug:5698410 Change-Id: Idff9cb52cabd4cc87427f975fee4968e779139bf
* | | Merge "fix monkey scrolling crash" into jb-devChris Craik2012-05-011-12/+12
|\ \ \
| * | | fix monkey scrolling crashChris Craik2012-05-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6336994 Depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/186187/ Change-Id: Id9a179728a504a32b52bede9d30deb0dbeb39423
* | | | Merge "Fix the clipping issue when webview has offset on X axis." into jb-devTeng-Hui Zhu2012-05-011-7/+40
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix the clipping issue when webview has offset on X axis.Teng-Hui Zhu2012-05-011-7/+40
| | |/ | |/| | | | | | | | | | | | | | | | | | | Add more comments to clarify the coordinate system. bug:6338952 Change-Id: Ia257c287040e638c3fa644a83ca1e97847bca70a
* | | Use different mechanism for enabling slider.George Mount2012-05-018-63/+95
| |/ |/| | | | | | | | | | | | | | | Bug 6413206 The HTML5 video scrubbing requires the old mechanism for getting touch events. Nearly a full revert of change I1d1ae457c50fe5b9627df7edb4f11d8245b5bdbf Change-Id: Ia3d07c1fddf5f5ed0f51a518c85f04bed415502e
* | Changes from code comments.George Mount2012-04-272-3/+4
| | | | | | | | | | | | Bug 6257532 Change-Id: Ic1c27ecdcbc6e4e6cf69dd73eb9b7b9a6d8b2c70
* | Merge "Don't crash on bad scale - DO NOT MERGE" into jb-devJohn Reck2012-04-271-1/+1
|\ \
| * | Don't crash on bad scale - DO NOT MERGEChris Craik2012-04-271-1/+1
| | | | | | | | | | | | | | | | | | bug:5367327 bug:5826464 Change-Id: Ic15b3c28d610ba688f8c41e0782b3d0896b61fe2
* | | Cherry-pick WebKit change r92025 to fix a rendering crashSteve Block2012-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/92025 Bug: 6328932 Change-Id: I2ed97a9f3d7d953f5a9bfe24b252124f896d31b4
* | | Cherry-pick WebKit change r90130 to fix a rendering crashSteve Block2012-04-271-16/+21
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/90130 Bug: 6328929 Change-Id: Iee0df9f81e1b73de0e1922b3b24e224389db8fa3
* | | Cherry-pick WebKit change r88472 to fix a rendering crashSteve Block2012-04-271-1/+4
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/88472 Bug: 6293530 Change-Id: I10bf2dfc6354d4e074a131e937aad04e0e6ca353
* | | Merge "Disallow cookies for JavaScript when disabled." into jb-devGeorge Mount2012-04-261-3/+9
|\ \ \
| * | | Disallow cookies for JavaScript when disabled.George Mount2012-04-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6363497 Change-Id: I97d6e7caf1820a624f92a12b69bd4ccfab80e0b9
* | | | Merge "Make input="range" visible and react to touch events." into jb-devGeorge Mount2012-04-269-97/+98
|\ \ \ \
| * | | | Make input="range" visible and react to touch events.George Mount2012-04-259-97/+98
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug 6257532 Change-Id: I1d1ae457c50fe5b9627df7edb4f11d8245b5bdbf
* | | | Merge "On new content, attach functor directly" into jb-devJohn Reck2012-04-264-30/+24
|\ \ \ \
| * | | | On new content, attach functor directlyChris Craik2012-04-254-30/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6323847 depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/184313/ Change-Id: I8f21317af746d501c92e338ce678434a2479576c
* | | | Merge "Fix use after free" into jb-devJohn Reck2012-04-261-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix use after freeJohn Reck2012-04-261-2/+2
| |/ / | | | | | | | | | | | | | | | Bug: 6396295 Change-Id: I7c115a06ee7605956d205d1401b84d1118c8be85
* | | Merge "Support partial draw in terms of a rect." into jb-devTeng-Hui Zhu2012-04-268-27/+49
|\ \ \
| * | | Support partial draw in terms of a rect.Teng-Hui Zhu2012-04-268-27/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | In this way, we can cover any internal rect area of the tiles. bug:6338952 Change-Id: If236a7f6ad82a3f9126a692ca5b08240a3631f88
* | | Merge "DO NOT MERGE: Fix clipping issue due to webview animation(scaling)" ↵Teng-Hui Zhu2012-04-263-27/+13
|\ \ \ | | | | | | | | | | | | into jb-dev
| * | | DO NOT MERGE: Fix clipping issue due to webview animation(scaling)Teng-Hui Zhu2012-04-253-27/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our visibleRect didn't respect the webview animation scaling before. Get rid of the old code about scaling for ortho projection, we don't need it any more since we moved onto the clip info. Rename the viewport to visibleRect which is used more often. bug:5684832 Change-Id: I8f49cbfd776a95073414ecc31e2fb40642e1ae0d cherry-pick the master change: https://android-git.corp.google.com/g/#/c/183080/
* | | Handle uncaught exceptions from methods called through the Java BridgeSteve Block2012-04-264-4/+28
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick from master. See https://android-git.corp.google.com/g/184252 If a method called on a Java object through the Java Bridge throws an uncaught exception, handle it native-side by clearing the exception to prevent a crash, and throwing a JavaScript exception. See tests in https://android-git.corp.google.com/g/184260 Bug: 6386557 Change-Id: I2d123672892887340798d2c0494941fc269ce99c
* | Fix crash in RenderLayerCompositor::updateCompositingLayersMangesh Ghiware2012-04-251-2/+7
|/ | | | | | | | | | | | | | Don't enable composited layers for fixed elements with a width or height of 1 or less. This duplicates the check used for deciding if layers following fixed layers are composited or not. This fixes the scenario where updateBacking() switches composited mode on (by calling enableCompositingMode()) because a layer is fixed, while computeCompositingRequirements() will disable it, and results in a segfault in updateCompositingLayers() Bug: 6324603 Change-Id: I034f2bd2f1a84fc24de6ab359c07f4895e2c7121
* Merge "CSS Background image implementation"Nicolas Roard2012-04-2420-56/+383
|\
| * CSS Background image implementationNicolas Roard2012-04-2420-56/+383
| | | | | | | | | | | | bug:1352305 Change-Id: Id9caaae9b9442729110b52c75004f634d8284db4
* | Merge "Don't overdraw TileGrids"Teng-Hui Zhu2012-04-249-28/+56
|\ \
| * | Don't overdraw TileGridsChris Craik2012-04-249-28/+56
| |/ | | | | | | | | | | | | Given the visible area info, we can just tune the shader and matrix to draw partial tile at the edge of TileGrids. This could save a lot of GPU time. Change-Id: I1a45aa9a3a76ab5894096828bfff83057b1c9272
* | Merge "Revert "Revert "Turn on Fence sync for transfer queue."""Teng-Hui Zhu2012-04-241-1/+1
|\ \
| * | Revert "Revert "Turn on Fence sync for transfer queue.""Teng-Hui Zhu2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | So it turns out the fence sync is not the cause of ANR. bug:6325463 This reverts commit 389739d3808edb3bc97ad75d2ea5e37e281ca411.
* | | signal framework to unregister functorChris Craik2012-04-232-10/+15
| |/ |/| | | | | Change-Id: Ia503e508a13c40c29f18db924dce4ac711b03c68
* | Fix up webkit to reflect Java class renamesJonathan Dixon2012-04-234-9/+9
| | | | | | | | | | | | | | | | | | GeolocationPermissionsClassic CookieManagerClassic WebIconDatabaseClassic WebStorageClassic Change-Id: I3fb125ea286db55c906d80e322b06060464a8bff
* | Temporarily disable functor use of kProcessModeChris Craik2012-04-201-0/+5
| | | | | | | | | | bug:6365056 Change-Id: Icd0c6b4741159f5413bd697be30b244c8c701ec6
* | Merge "Better handle the EGL context lost situation."Teng-Hui Zhu2012-04-2011-78/+107
|\ \
| * | Better handle the EGL context lost situation.Teng-Hui Zhu2012-04-2011-78/+107
| |/ | | | | | | | | | | | | | | | | Unless framework provide a better message, we can't avoid this EGL context issue totally if mis-match happen again. Clean up some obsolete code. Change-Id: Ica03daecd58f9757c8cad41e0f40d5d51b041748
* | Merge "Revert "Revert "Add webkit plumbing for file origin policy"""Selim Gurun2012-04-191-0/+15
|\ \ | |/ |/|
| * Revert "Revert "Add webkit plumbing for file origin policy""Selim Gurun2012-04-191-0/+15
| | | | | | This reverts commit 68c1e19ccf6ea08208332b6cd19fadc5716159f5
* | Merge "fix minor warnings and style issues"Chris Craik2012-04-192-12/+3
|\ \
| * | fix minor warnings and style issuesChris Craik2012-04-192-12/+3
| | | | | | | | | | | | Change-Id: Iaa4b1abeca17df54a4ddd169a3828695b8dcc776
* | | Merge "rename audio policy output flags."Eric Laurent2012-04-181-1/+1
|\ \ \
| * | | rename audio policy output flags.Eric Laurent2012-04-181-1/+1
| |/ / | | | | | | | | | Change-Id: I2d0c6a33bc8d9bb163506cdfa7dcb25e4b54d01a
* | | Merge "prevent double TileGrid preparation"Chris Craik2012-04-187-90/+100
|\ \ \
| * | | prevent double TileGrid preparationChris Craik2012-04-187-90/+100
| |/ / | | | | | | | | | | | | | | | | | | | | | bug:6346848 also renamed TileGrid* variables for clarity Change-Id: Ie0e56a6e1e85db426c4944b03125248cd6a647c0
generated by cgit v1.1 at 2024-09-09 05:37:34 +0000