summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Improve tile painting prioritization to minimize stalled, blank tiles"Chris Craik2011-09-142-17/+16
|\
| * Improve tile painting prioritization to minimize stalled, blank tilesChris Craik2011-09-142-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5320450 * Greedily deallocate textures from stolen tiles * Force all prioritization values to be positive * Create simply described prioritization ordering: * Draw count * Has front texture? * position (if base tile) Change-Id: Icd5dab931f735c14c18feef5186c8245c5956cfd
* | Merge "A better WAR of driver issue by using GPU fence"Teng-Hui Zhu2011-09-143-13/+39
|\ \
| * | A better WAR of driver issue by using GPU fenceTeng-Hui Zhu2011-09-133-13/+39
| | | | | | | | | | | | | | | bug:5270526 Change-Id: I790a3fc995edc73192b2bcb24eaa29e99434f2fb
* | | Merge "Allocate textures based purely on viewport size"Chris Craik2011-09-131-2/+5
|\ \ \ | |/ / |/| / | |/
| * Allocate textures based purely on viewport sizeChris Craik2011-09-131-2/+5
| | | | | | | | | | | | | | | | | | | | bug:5211417 Allocate textures based upon viewport size, instead of visible nr of tiles. This will help prevent rare OOM issues triggering from a certain position in the page. Change-Id: Ib43fef0e0b9b8e4e26df448d67bb159a105e300c
* | Merge "Fix layer tile allocation to be more consistent, less disco"Chris Craik2011-09-134-17/+34
|\ \ | |/
| * Fix layer tile allocation to be more consistent, less discoChris Craik2011-09-124-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5290559 Two major things: * Avoid swapping front/back textures before the textures have been blitted to avoid race condition where blit fails because it doesn't see a back texture * Don't allow a tile to acquire its front texture to paint into, as the acquisition logic doesn't handle this. Change-Id: I84b59396ca9faaf3ddc7c75b6f66e4736bf4c3cf
* | Merge "Fix the poster issue and full screen behavior html5 video"Teng-Hui Zhu2011-09-121-2/+16
|\ \ | |/ |/|
| * Fix the poster issue and full screen behavior html5 videoTeng-Hui Zhu2011-09-121-2/+16
| | | | | | | | | | | | | | | | | | | | This is related to the change in https://bugs.webkit.org/show_bug.cgi?id=49481, and it seems there is some following up discussion in this area. We will just follow what we did from Honeycomb and work around issues for now. bug:4523481 Change-Id: I3c2225afb078c24db423119a235266f222055431
* | Fudge layer translation to always line up with view pixelsChris Craik2011-09-113-20/+24
| | | | | | | | | | | | bug:3367478 Change-Id: I37632de8503b0f3eba0a183a156d71ea48bdba98
* | Merge "If unlock base layer marks tiles dirty, repaint"Chris Craik2011-09-094-22/+39
|\ \
| * | If unlock base layer marks tiles dirty, repaintChris Craik2011-09-084-22/+39
| | | | | | | | | | | | | | | bug:5278818 Change-Id: I03206bdc5e95743054c361f235e2d94b835a95d1
* | | Merge "Hookup internal plumbing needed to expose new plugin API."Derek Sollenberger2011-09-092-0/+3
|\ \ \
| * | | Hookup internal plumbing needed to expose new plugin API.Derek Sollenberger2011-09-092-0/+3
| |/ / | | | | | | | | | | | | bug: 5239378 Change-Id: I2078db559315f93e8c43052bf9718566157f971b
* | | Merge "Cherry-pick WebKit change 93521 to fix FrameLoader"Steve Block2011-09-091-8/+27
|\ \ \ | |/ / |/| |
| * | Cherry-pick WebKit change 93521 to fix FrameLoaderSteve Block2011-09-091-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/93521 Note that the change did not apply cleanly to FrameLoader::stopLoading() because we don't have http://trac.webkit.org/changeset/90164. See bug for details. Bug: 5264509 Change-Id: I824284b9daaa8bc033aebca558d5362ebfb617d8
* | | Merge "Stop layer tile flickering"Chris Craik2011-09-081-11/+14
|\ \ \
| * | | Stop layer tile flickeringChris Craik2011-09-081-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5265207 Don't steal textures with a draw count from last frame to prevent flickering Change-Id: I0a37b2417f0721b150b47920feea9ddb1666ec28
* | | | Merge "Deallocate graphics memory with onTrimMemory signals"Chris Craik2011-09-086-1/+69
|\ \ \ \
| * | | | Deallocate graphics memory with onTrimMemory signalsChris Craik2011-09-086-1/+69
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5269460 Deallocate the graphics memory backing a BaseTileTexture on onTrimMemory signals, and accordingly allocate it lazily, as needed. Change-Id: I52039723f47e6470e4fe8dd987d384017005390f
* | | | Merge "Add Plugin API for a video framerate callback."Derek Sollenberger2011-09-087-4/+66
|\ \ \ \
| * | | | Add Plugin API for a video framerate callback.Derek Sollenberger2011-09-087-4/+66
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 5239378 Change-Id: I5f7d33302d5a40f58ec12a3c0be63cb51d4ffc75
* | | | | Merge "Roll back fix for http://b/issue?id=4203823"Ben Murdoch2011-09-081-4/+1
|\ \ \ \ \
| * | | | | Roll back fix for http://b/issue?id=4203823Ben Murdoch2011-09-081-4/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow positioned divs with overflow to scroll. Keeps tidying up that fix for http://b/issue?id=4203823 did and rolls back the functional change. Bug: 5216561§ Change-Id: I6268bbe880c432c87ca04e68697f66b32b7032d0
* | | | | Merge "The CPU code path for uploading the textures"Teng-Hui Zhu2011-09-082-0/+14
|\ \ \ \ \
| * | | | | The CPU code path for uploading the texturesTeng-Hui Zhu2011-09-062-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just for debugging anything related to the driver/HW. Change-Id: I26757f8259ec6b6c2406f78bf7aa9c5f527e31e7
* | | | | | Merge "Implement PictureSet(SkPicture*) ctor in FAST_PICTURESET case"John Reck2011-09-071-0/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Implement PictureSet(SkPicture*) ctor in FAST_PICTURESET caseJohn Reck2011-09-071-0/+21
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 5270617 Change-Id: I5bcdf551a028588aa34956f98039d893d646b362
* | | | | Merge "Revert to allocate textures for layers which had overflow children."Teng-Hui Zhu2011-09-071-1/+1
|\ \ \ \ \
| * | | | | Revert to allocate textures for layers which had overflow children.Teng-Hui Zhu2011-09-071-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original change on minimizing the texture for the overflow layer is too aggressive. Revert this until we have a better solution. bug:5254818 Change-Id: I77b43f151e801dd896baf197b9e523d20f42b469
* | | | | Merge "OnTrimMemory plumbing"John Reck2011-09-071-0/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | OnTrimMemory plumbingJohn Reck2011-09-071-0/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 5269460 Change-Id: Iad6513787b6737d45f1537973e08469005ed4dac
* | | | Merge "Cherry-pick WebKit change 92744 to fix RenderObjectChildList"Steve Block2011-09-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Cherry-pick WebKit change 92744 to fix RenderObjectChildListSteve Block2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/92744 Bug: 5263877 Change-Id: I672c48d3fb6dc90d0721b6c5638070eb944596f4
* | | | Merge "Fix for plugin being "centered" to the left corner instead of center"Derek Sollenberger2011-09-071-9/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix for plugin being "centered" to the left corner instead of centerDerek Sollenberger2011-09-061-9/+8
| | | | | | | | | | | | | | | | | | | | bug: 5149930 Change-Id: I23aa7f8292806897cbc99f7a36e6aec428daf859
* | | | Merge "Cherry-pick WebKit change 85623 to fix ↵Steve Block2011-09-061-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | RenderInline::culledInlineAbsoluteQuads()"
| * | | | Cherry-pick WebKit change 85623 to fix RenderInline::culledInlineAbsoluteQuads()Steve Block2011-09-061-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/85623 Bug: 4986300 Change-Id: If557cbd8c6914dc6875b87cfe04591f9bfa42047
* | | | Merge "Fix logic error in Android style version calculation."Ben Murdoch2011-09-061-2/+6
|\ \ \ \
| * | | | Fix logic error in Android style version calculation.Ben Murdoch2011-09-061-2/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to update the style version on a width or height change, and also detect a transition from display:none to display:something (and vice versa) in which case WebKit will pass the display:none style as a null pointer. Bug: 5137070 Change-Id: I82fa3fbe990cfc4c733a2f4fed8be37f11e44ba4
* | | | Merge "Revert "WebView animation support""Teng-Hui Zhu2011-09-064-40/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "WebView animation support"Teng-Hui Zhu2011-09-064-40/+5
| |/ / | | | | | | | | | | | | | | | | | | This reverts commit 078f4452393311da6165131451fcf86e04e04f25. bug:5264188 Change-Id: I3dd6cf46a168893aa3067615f2f0f902c6f66d74
* | | Fix old textures not being repaintedChris Craik2011-09-061-0/+4
|/ / | | | | | | | | | | | | | | | | bug:5261488 Tile textures that were reacquired by the same tiles weren't being marked as dirty. Change-Id: Ie5c41ff7a8166e5e48736bdc504b90e8c5512f79
* | Enable double buffering via base tilesChris Craik2011-09-0219-338/+382
| | | | | | | | | | | | | | | | | | | | | | | | bug:2522049 allocate textures and tiles using the gldraw count when they were most recently prepared remaining issues: -layers still flicker (presumably from texture stealing) -layers aren't double buffered yet Change-Id: Iccdf68326d7d476269d4e3a13903aaab249ee92d
* | Merge "Fix the Java bridge to correctly handle null strings"Steve Block2011-09-021-0/+15
|\ \
| * | Fix the Java bridge to correctly handle null stringsSteve Block2011-09-021-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing null to methods expecting java/lang/String ... - Previously null was converted to the empty string but should be converted to Java null. - convertNPVariantToJavaValue() already converts a null NPVariant to a null WTF::String. - Fixed javaValueToJvalue() to convert a null WTF::String to a null jvalue. Returning null from a method with return type java/lang/String ... - Previously this would crash when trying to get the characters from the null jstring, but should return JavaScript undefined. - Fixed jvalueToJavaValue() to convert a null jvalue to a null WTF::String. - Fixed convertJavaValueToNPVariant() to convert a null WTF::String to a void NPVariant. Both of these are regressions from HC due to http://trac.webkit.org/changeset/82194. Added tests in https://android-git.corp.google.com/g/#/c/132580 Bug: 5222742 Change-Id: Id08bc7b40a51426fa7638ad0ed5260d09f3e28bb
* | | Merge changes Iebbac8a9,I854067cbSteve Block2011-09-021-12/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Incorrect handling of 'display:' property within nested <ruby> tags Remove some unsafe static_cast in rendering/
| * | | Incorrect handling of 'display:' property within nested <ruby> tagsSteve Block2011-09-021-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of http://trac.webkit.org/changeset/89987 Bug: 5244760 Change-Id: Iebbac8a93d6aabd0f8d568c9b1ace6f9316a6b6c
| * | | Remove some unsafe static_cast in rendering/Steve Block2011-09-021-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial cherry-pick of http://trac.webkit.org/changeset/89304 It is required to allow us to cherry-pick http://trac.webkit.org/changeset/89987 Bug: 5244760 Change-Id: I854067cbc297e667ec432f947a268eef5c4dfa0f