summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | | | am 56230b69: Merge "Fix the clipping issue when webview has offset on X ↵Teng-Hui Zhu2012-05-011-7/+40
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | axis." into jb-dev * commit '56230b690633d279998dfc559f5358ebce801de1': Fix the clipping issue when webview has offset on X axis.
| * | | | | | 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
* | | | | | | am f2e22333: Use different mechanism for enabling slider.George Mount2012-05-018-63/+95
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f2e2233332c5b4a4b584c0a10b8bac10b6122acf': Use different mechanism for enabling slider.
| * | | | | | 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
* | | | | | am 940c4778: Changes from code comments.George Mount2012-04-302-3/+4
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * commit '940c47782e72ed37ba9f1193af1265a56a3df7e1': Changes from code comments.
| * | | | 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 "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 "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-2418-37/+332
|\ \
| * | CSS Background image implementationNicolas Roard2012-04-2418-37/+332
| | | | | | | | | | | | | | | | | | 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-231-5/+0
| |/ / |/| | | | | | | | Change-Id: Ia503e508a13c40c29f18db924dce4ac711b03c68
* | | Temporarily disable functor use of kProcessModeChris Craik2012-04-201-0/+5
| | | | | | | | | | | | | | | bug:6365056 Change-Id: Icd0c6b4741159f5413bd697be30b244c8c701ec6
* | | Better handle the EGL context lost situation.Teng-Hui Zhu2012-04-2010-75/+106
|/ / | | | | | | | | | | | | | | | | 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 "fix minor warnings and style issues"Chris Craik2012-04-191-5/+3
|\ \
| * | fix minor warnings and style issuesChris Craik2012-04-191-5/+3
| |/ | | | | | | Change-Id: Iaa4b1abeca17df54a4ddd169a3828695b8dcc776
* | prevent double TileGrid preparationChris Craik2012-04-187-90/+100
|/ | | | | | | | bug:6346848 also renamed TileGrid* variables for clarity Change-Id: Ie0e56a6e1e85db426c4944b03125248cd6a647c0
* Merge "Enable point sample when the texel and pixel is 1:1 mapping."Teng-Hui Zhu2012-04-177-9/+48
|\
| * Enable point sample when the texel and pixel is 1:1 mapping.Teng-Hui Zhu2012-04-177-9/+48
| | | | | | | | Change-Id: I532ad6b038d3b141bd212c8c408533fec0e9616e
* | Merge "add basic webview tracing"Chris Craik2012-04-171-0/+2
|\ \
| * | add basic webview tracingChris Craik2012-04-161-0/+2
| | | | | | | | | | | | Change-Id: Id97ce1efab5918802cff5b90c0122b4cc2d7e73d
* | | Merge "Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash""Teng-Hui Zhu2012-04-162-14/+10
|\ \ \ | |/ / |/| |
| * | Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"Teng-Hui Zhu2012-04-162-14/+10
| |/ | | | | | | | | | | | | | | | | | | This was causing HTML5 video to crash. bug:6342146 This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e. Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
* | Merge "Revert "Turn on Fence sync for transfer queue.""Chris Craik2012-04-161-1/+1
|\ \ | |/ |/|
| * Revert "Turn on Fence sync for transfer queue."Chris Craik2012-04-161-1/+1
| | | | | | | | | | | | | | Was causing ANRs bug:6325463 This reverts commit 79620b0826fdbb2f0d125042f1414391b51fc5fa
* | Merge "Move the common matrix computation to higher level"Teng-Hui Zhu2012-04-162-16/+32
|\ \
| * | Move the common matrix computation to higher levelTeng-Hui Zhu2012-04-162-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | Now we don't need to compute the same thing for each tile any more. bug:6338456 Change-Id: I68e744ab7af2bb55a67047bc16aeb8659b26daf2
* | | Merge "Move the matrix support to rely on the new framework clip info"Teng-Hui Zhu2012-04-165-89/+124
|\ \ \ | |/ /
| * | Move the matrix support to rely on the new framework clip infoTeng-Hui Zhu2012-04-135-89/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this new way, we don't need to worry about the animation offset, b/c it is in the clip rect. Also add the matrix support for video layer. bug:5684832 Change-Id: I08e22ca042e425f8f7af935b60e04f2a4dbc52df
* | | Merge "Fix Gradient & Pattern handling"John Reck2012-04-134-146/+45
|\ \ \
| * | | Fix Gradient & Pattern handlingJohn Reck2012-04-134-146/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6300357 Switch to GradientSkia (fixes the crash) Fix GraphicsContextAndroid to delay setting the fill & stroke shaders until immediately before they are needed, as they can be updated between when they are set and when they are used, which SkShader doesn't support. Change-Id: I85c81ad5764495f45547d2cef08bcf7ed7a885c1
* | | | Merge "only profile drawing frames"Chris Craik2012-04-131-3/+4
|\ \ \ \
| * | | | only profile drawing framesChris Craik2012-04-131-3/+4
| | |/ / | |/| | | | | | | | | | Change-Id: I743a0bf1989572a7c48ebf9f0691c9cec9bef098