summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix crash in LayerAndroid::addAnimation" into honeycombBen Murdoch2011-01-251-1/+2
|\
| * Fix crash in LayerAndroid::addAnimationBen Murdoch2011-01-251-1/+2
| | | | | | | | | | | | | | Transfer PassRefPtr to RefPtr. Credit to Jason Simmons for the fix. Bug:3385803 Change-Id: Id148923e95d5628a625c87fe093b85dd381e781e
* | Merge "Merge WebKit at Chromium 9.0.597.83: Trivial merge by git." into ↵Ben Murdoch2011-01-251-17/+14
|\ \ | | | | | | | | | honeycomb
| * | Merge WebKit at Chromium 9.0.597.83: Trivial merge by git.Ben Murdoch2011-01-251-17/+14
| |/ | | | | | | Change-Id: I027931929980a55d4d5e883f659c116c77dbb2a9
* | Merge "Use platform bridge to control high usage delta MB." into honeycombShimeng (Simon) Wang2011-01-251-0/+1
|\ \ | |/ |/|
| * Use platform bridge to control high usage delta MB.Shimeng (Simon) Wang2011-01-241-0/+1
| | | | | | | | | | | | | | This change gives flexibility to change that value in Java side. issue: 3317722 Change-Id: I71a548871783cc604e0daec63e6bbfb26ecc1e1f
* | Fix "jumpy" mode and textfield inputNicolas Roard2011-01-254-15/+26
| | | | | | | | | | | | bug:3382562 bug:3384930 Change-Id: I55b97cacc9c50ae5a0b5dfc39658bb63c8aa9e87
* | Merge "Improve layers repaint mechanism" into honeycombNicolas Roard2011-01-243-13/+41
|\ \
| * | Improve layers repaint mechanismNicolas Roard2011-01-243-13/+41
| |/ | | | | | | | | | | bug:3375416 Change-Id: I9e86736c9f7910765bea739cdd0e04331b98f155
* | Work around for pure virtual layers crash.Ben Murdoch2011-01-243-2/+68
|/ | | | | | | | | | | | | TextureOwner can be left still owning a texture when we come to delete that TextureOwner. Then later the texture it still owns tries to access it's owner and we crash. Work around by explicity releasing any owned textures when we delete the texture owner. Bug:3367855 Change-Id: I38877b7088d27f51d98cfd182d937fe5cb3b9f8d
* Remove logsNicolas Roard2011-01-231-2/+0
| | | | | bug:3379585 Change-Id: Ica133d128f940a71afdd44130735eab11e4daf4e
* Implement tiles synchronizationNicolas Roard2011-01-237-10/+95
| | | | | | | | | | When a tiledPage is painted, we want to avoid updating the base layer. GLWebViewState and WebView.cpp are now refcounting the base layer, delaying updating the base layer we use to paint until we are done with a full tile paint. bug:3224744 Change-Id: Ica2b8f1db146a1e059fc0735dc53107fc40da07a
* Video doesn't use a layer as we hand it off to the fullscreen player.Ben Murdoch2011-01-211-3/+4
| | | | | | | Fix null pointer deref. Bug:3364538 Change-Id: Iafeecd81ec422de6e17ec8a0c36c29e4fcf7fc74
* relocate the glFinish to prevent it from needlessly executing.Derek Sollenberger2011-01-201-2/+2
| | | | | bug: 3374501 Change-Id: Idb6836cb8e3919066d77cbcca8b09a6f261dae31
* Merge "Fix deadlock in textures generator" into honeycombNicolas Roard2011-01-201-8/+9
|\
| * Fix deadlock in textures generatorNicolas Roard2011-01-201-8/+9
| | | | | | | | | | bug:3373656 Change-Id: If6428b88a135fe1184e92bf345ddbae349622c94
* | Merge "Fix "jump" bug" into honeycombNicolas Roard2011-01-191-2/+3
|\ \
| * | Fix "jump" bugNicolas Roard2011-01-191-2/+3
| |/ | | | | | | | | bug:3349970 Change-Id: I7e095c541bc8a106c94c14a70f121ea3b24f06f4
* | Merge "Fix (or partial fix) for 3355185, crash on ↵Russell Brenner2011-01-191-1/+0
|\ \ | | | | | | | | | broken-ideograph-small-caps.html" into honeycomb
| * | Fix (or partial fix) for 3355185, crash on broken-ideograph-small-caps.htmlRussell Brenner2011-01-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Emptied platformDestroy(). It was deleting m_smallCapsFontData, but not setting it to 0. The caller, ~SimpleFontData(), then went on to use the deleted pointer and delete it again. This was changed for other platforms with http://trac.webkit.org/changeset/71975. Change-Id: Ie67f91559479a17519db7793c7349eb013235320
* | | don't draw buttons while they are createdCary Clark2011-01-192-3/+8
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | There are three threads all hammering at the same resource. The WebViewCore thread records the buttons on the page. The WebView thread rerecords the button pictures to show selection and focus. The GLWebViewState thread draws the picture containing the button pictures into the tile. Prevent drawing the picture while the buttons are recorded by sharing the button mutext with the GL tile creation. bug:3354678 Change-Id: I245ed47ad5a6d1fe28ea870bd7c557937eed1164
* | Implement partial layer rendering (support for large layers)Nicolas Roard2011-01-1812-45/+114
| | | | | | | | | | | | | | | | Also fix a couple of potential ANRs bug:3333984 Change-Id: I28c02ef74f4c70507fcd7f5bbc893b0d0eae61c0
* | Implement re-scaling for layersNicolas Roard2011-01-1711-84/+272
|/ | | | | | Change-Id: I1f998387831207d00f27945ee4e456f81ff6f6e2 Change-Id: I7efcccfd9a4374061300058d4c48fa82a973829a
* Merge "b/3133123 Pass touch point ids to WebKit" into honeycombHuahui Wu2011-01-132-3/+6
|\
| * b/3133123 Pass touch point ids to WebKitHuahui Wu2011-01-132-3/+6
| | | | | | | | | | | | | | | | | | This is the CL in WebKit side and it needs the framwork CL: https://android-git.corp.google.com/g/#change,89630 Notice some changes touch open source WebKit's code, so b/3351313 is filed to keep track of that. Change-Id: I0ac5d75c4a90f14afeb2e3fc2dc5b1c437c631f8
* | More debug info for each layerTeng-Hui Zhu2011-01-131-1/+16
| | | | | | | | | | | | The matrix info can help to determine the layer positioning issue. Change-Id: Ie254e13d649c6a3aab820e8fe9553517ca42be72
* | Revert a WAR.Teng-Hui Zhu2011-01-133-14/+0
| | | | | | | | | | | | | | | | | | | | Revert a WAR for issue 3215000. https://android-git.corp.google.com/g/#change,81012 With the current fix, this WAR is not necessary. b:3215000 Change-Id: I47261f19fbd87864d6b41edfbdb50be1fbbfccc7
* | Code clean up.Teng-Hui Zhu2011-01-133-5/+4
| | | | | | | | | | | | There should be no functionality change. Change-Id: Ifc05a776ebb0a2a00b3aff194e138847ed1201cf
* | The fixed element layer should not inherit the parent matrixTeng-Hui Zhu2011-01-121-1/+3
| | | | | | | | | | | | | | | | The fixed element layer should start from an identity matrix. And apply local transformation. Change-Id: I9243f8c496bdbd5ee66e18b23715f9935e5574b6 b:3344290
* | The m_projectionMatrix in the ShaderProgram need to be updatedTeng-Hui Zhu2011-01-121-0/+1
| | | | | | | | | | | | | | | | | | When there is only layers (no baseLayer), m_projectionMatrix is not updated for every draw call, such that it doesn't reflect the visibleRect info. Change-Id: I527f86d6d16034e56c3215f011c20196b02b16c2 b:3335132
* | Fix the invalidate on the layerTeng-Hui Zhu2011-01-111-1/+6
|/ | | | | | | For each layer, if its content is dirty, it should tell the Java to redraw. Change-Id: If1fe006c0777130083ddc84778104fff35435a1b b:3327600
* Merge "Change the transition from cross-fading to simple fading of only one ↵Nicolas Roard2011-01-101-2/+3
|\ | | | | | | of the TiledPage." into honeycomb
| * Change the transition from cross-fading to simple fading of only one ofNicolas Roard2011-01-101-2/+3
| | | | | | | | | | | | | | the TiledPage. bug:3335076 Change-Id: Ia2a0de24e7c13d7cf3bbae8b17e9db1e377aa8a4
* | Merge "Ensure that PopupReply does not take action after disconnection." ↵Leon Scroggins2011-01-102-8/+36
|\ \ | |/ |/| | | into honeycomb
| * Ensure that PopupReply does not take action after disconnection.Leon Scroggins2011-01-102-8/+36
| | | | | | | | | | Bug:3326203 Change-Id: Ieec8765fae0af7d4f2b0f56167cb1b221fa73687
* | Fix alpha compositing in the shaders to work with premultiplied alphaNicolas Roard2011-01-072-2/+2
| | | | | | | | | | | | | | textures bug:3332829 Change-Id: Iffce6322fca694e85dd51dbc4147f4309f350eca
* | Add debug infoTeng-Hui Zhu2011-01-072-4/+16
| | | | | | | | | | | | | | | | When we have such extra info in the log, it could lead to a root cause more directly without manual adding and rebuilding. bug:3307016 Change-Id: I7699c554923d1cdc4ddeb9795ad9c89687b1f27a
* | Redo the clippingRect calculationTeng-Hui Zhu2011-01-073-16/+21
| | | | | | | | | | | | | | | | | | | | | | Although the intersetcion is done correctly, but the clippingRect should take the parents' matrix into account. To make the code cleaner, we convert all the rects into screen coordinate for intersection. bug:3304761 Change-Id: Ia3dc3e7b72f2e72eaab66ba8e017d89ab71dc468
* | Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-079-36/+93
|/ | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* When canceling <select> popup leave the value unchanged.Leon Scroggins2011-01-061-0/+3
| | | | | | Bug:3328658 Change-Id: I70e7fa72a0f2df3957cb295efdf404fd91511610
* Merge WebKit at r72805: Cherry-pick WebKit change 73062Steve Block2011-01-065-24/+80
| | | | | | | | | | | | | | | This change is the upstreaming of local changes in WebCore/platform/network. It did not generate conflicts in the merge to r73109 as both upstream and local versions matched at r73109. But since it appears after r72805, it was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/73062 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I6a266e1270cbc1f155065ae1c56c491ccf33e497
* Merge WebKit at r72805: Update GraphicsContext method signaturesSteve Block2011-01-061-20/+7
| | | | | | | | | | | | Note that this is a partial revert of "Merge Webkit at r73109: graphics method signature changed." See http://trac.webkit.org/changeset/72926 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I7e999ae384bd791c5953f5edcf494a008e6fceea
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0644-664/+355
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge "refine empty picture test to look for color rects"Cary Clark2011-01-061-4/+2
|\
| * refine empty picture test to look for color rectsCary Clark2011-01-051-4/+2
| | | | | | | | | | bug:3296986 Change-Id: I171435f6285f671abc9f2e38ad00ebcabb783cb3
* | clip rect fix for iframe when GL onTeng-Hui Zhu2011-01-041-9/+7
|/ | | | | | | | | | | | | | First, for each layer, the clip rect should be intersecting with all of its parents. Then the rect should use pre-transformation info, the real transformation will handle by the clip() function. P.S: renaming variable "bounds" b/c there is a member function using the same name. bug:3304761 Change-Id: Id5d602b55da904c63b37cb5436b5bf2f5526a94f
* Merge "A WAR to get content showing up when GL enabled"Teng-Hui Zhu2010-12-291-2/+4
|\
| * A WAR to get content showing up when GL enabledTeng-Hui Zhu2010-12-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | The emptiness check is not optimal for GL rendering yet. That cause some content are not showing up when GL enabled. A WAR is to just update the textures and use them without emptiness check. bug: 3296986 Change-Id: I5087dbc34b744ffbe24f4a4a6616f4d5715e1f11
* | Merge Webkit at r73109: Fix conflictsShimeng (Simon) Wang2010-12-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. WebCore/Android.jscbindings.mk http://trac.webkit.org/changeset/72590 http://trac.webkit.org/changeset/72344 2. WebCore/WebCore.vcproj/WebCore.vcproj too many changes between 72274 and 73109 http://trac.webkit.org/log/trunk/WebCore/WebCore.vcproj/WebCore.vcproj also due to Android change. https://android-git.corp.google.com/g/#change,37374 3. WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/72631 4. WebCore/rendering/RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 our code is not upstreamed 5. WebCore/rendering/RenderView.h http://trac.webkit.org/changeset/72852 http://trac.webkit.org/changeset/73063 Change-Id: Id7a1dbdfef6327b4fe08c9884122bf9decd039ca
* | Merge Webkit at r73109: graphics method signature changed.Shimeng (Simon) Wang2010-12-221-8/+21
| | | | | | | | | | | | | | | | this is because: http://trac.webkit.org/changeset/72926 http://trac.webkit.org/changeset/72528 Change-Id: I511eef7fece8e97ed4a199ca7b6f388124921b79