summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixed 3469204: Crash using downloaded fonts" into honeycomb-mr1Russell Brenner2011-03-072-2/+12
|\
| * Fixed 3469204: Crash using downloaded fontsRussell Brenner2011-03-042-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is still pending upstream, but is being applied here now to make it into M1 before lockdown. Track the WebKit change at: https://bugs.webkit.org/show_bug.cgi?id=54758 When font downloading completes, CSSFontFaceSource::fontLoaded() and CSSSegmentedFontFace::fontLoaded() called pruneTable() to reclaim GlyphPageTreeNode memory. On Android, downloading and rendering are on different threads and these GlyphPageTreeNodes may still be in use on the UI thread. This change defers freeing those GlyphPageTreeNodes until CSSFontFaceSource and CSSSegmentedFontFace are destroyed, which occurs on the UI thread in response to Document::scheduleForcedStyleRecalc(), which was called by CSSFontSelector::fontLoaded(). Change-Id: Ica74e5be92c00b8c761f5d29a2310c46e62fd9eb
* | Do not merge.Patrick Scott2011-03-075-32/+12
| | | | | | | | | | | | | | | | | | | | | | Remove the notion of root layers. We were computing the root layer status incorrectly for some child layers. If an iframe has a layer but it hasn't been attached, we might assume it is the root layer of the tree and not produce a recording content. Bug: 3492471 Change-Id: Ib81fb26d76742d74ebe244c34c1fab353fb9b78d
* | Merge "ensure plugins draw correctly even when they have been given focus." ↵Derek Sollenberger2011-03-035-42/+42
|\ \ | |/ |/| | | into honeycomb-mr1
| * ensure plugins draw correctly even when they have been given focus.Derek Sollenberger2011-03-035-42/+42
| | | | | | | | | | | | | | | | | | | | | | The initial attempt at fixing this bug was to modify the clip, but this was not correct and only fixed cases where the plugin was on the left edge of the screen. This CL properly adjusts the plugin's boundaries to make sure the content is drawn in the appropriate position. bug: 3477581 Change-Id: I5958228a93fa5600cd7e24ed9e7e1e26f6b241bc
* | Do not merge: Cherry-pick change I9942e8e4 from masterNicolas Roard2011-03-031-2/+4
|/ | | | | | | | | | | | | | | | | | Wait the remaining of the 60FPS cap delay rather than not paint. Returning true if called faster than 60FPS means we are not drawing and ask for the framework to call us again; this works in general because the framework recopy the previous framebuffer. But in some cases, it didn't, causing the webview to flicker. A correct fix would be to introduce the capping in framework rather than try to doing it in the webview; in the meantime we will sleep the remaining of the delay as a workaround, so that we still provide the GPU benefits we wanted (at >60FPS the GPU was being saturated in some cases). bug:3500655 Change-Id: Ibaa1d93e0a13433a2c842b19b58538894fdaa7e4
* Merge "Enable the plugin to specify the BGRA internal format for textures."Bart Sears2011-03-021-0/+1
|\
| * Enable the plugin to specify the BGRA internal format for textures.Derek Sollenberger2011-03-021-0/+1
| | | | | | | | Change-Id: I21555e923ba6ac6c2bcd291ffa73a1aa087bdb3b
* | Merge "Ensure plugin content does not shift when gaining focus."Derek Sollenberger2011-03-023-1/+25
|\ \ | |/
| * Ensure plugin content does not shift when gaining focus.Derek Sollenberger2011-03-023-1/+25
| | | | | | | | | | bug: 3477581 Change-Id: Ia7bbaaca405db33dbefaa8f6f00e9250580e5f7b
* | Merge "Fix Browser ANR"Nicolas Roard2011-03-021-1/+7
|\ \ | |/ |/|
| * Fix Browser ANRNicolas Roard2011-03-021-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | The dtor of GLWebViewState is calling the dtor of its TiledPage variables; the dtor of TiledPage wait until any pending painting operations running in the TextureGenerator thread are done. The painting operations ultimately paint using the current GLWebViewState's base layer. We were doing unref() on the baselayer before destroying the TiledPage... bug:3429924 Change-Id: I685e7fca5e5bae796f808debbf7e4ce668b83e6b
* | Merge "Crash on GL OOM to stop fallback to SW rendering."Ben Murdoch2011-03-021-1/+13
|\ \
| * | Crash on GL OOM to stop fallback to SW rendering.Ben Murdoch2011-02-281-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we detect an OOM from GL, crash the process to stop the framework falling back to software rendering. The framework will not enable HW rendering again until the process is killed and Flash does not work with software rendering. Bug: 3477085 Change-Id: I8defebbe3ea281c342fc99ace8638c347a3eb246
* | | Merge "Revert "Work around for pure virtual layers crash.""Ben Murdoch2011-03-024-72/+3
|\ \ \ | |_|/ |/| |
| * | Revert "Work around for pure virtual layers crash."Ben Murdoch2011-02-184-72/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2879037f2d6c595b8c16e992462ce5ca60d8fdba. Revert the original work around as the underlying problem is fixed with I2747dd4630a2a7dc18eae4c5fde36fd14c461747 Change-Id: Ibc1e997bca2aadc27527b6980de38603e6971770
* | | GL perfs measurementNicolas Roard2011-03-012-2/+56
| | | | | | | | | | | | Change-Id: Id6e0b8199f82c44de0e7b1b7e7eb42bdb96bf908
* | | Merge "Fix framerate cap when multiple webviews exist."Derek Sollenberger2011-03-012-4/+4
|\ \ \
| * | | Fix framerate cap when multiple webviews exist.Derek Sollenberger2011-03-012-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each view will now be capped at 60fps. The previous code would either starve the drawing of additional webviews or would draw them at a rate of 60fps/N where N is the number of webviews. Change-Id: I5698d610b17d4c8cfe137c51c2b978dae04ae1cf
* | | | Merge "Fix warning"Kristian Monsen2011-03-011-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix warningKristian Monsen2011-03-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ifb290ab8e027b1828c1c10ca3ee70eadedf23f66
* | | | Merge "Add support for plugins to use incognito mode."Derek Sollenberger2011-03-011-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for plugins to use incognito mode.Derek Sollenberger2011-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | bug: 2968415 Change-Id: Ie67c9f6b28a81d4a65f39bde2896078d7b49b8ee
* | | | Merge changes I7d73cc44,I610ebdbcBen Murdoch2011-03-015-11/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revision Merge WebKit at Chromium 9.0.597.107: Initial merge by git.
| * | | | Merge WebKit at Chromium 9.0.597.107: Initial merge by git.Ben Murdoch2011-02-285-11/+48
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78920 on the 597 release branch. Change-Id: I610ebdbcba92cfa788b229ee207a405789d45e67
* | | | Cap framerate at 60fpsNicolas Roard2011-02-282-2/+15
|/ / / | | | | | | | | | Change-Id: I1b6be15a38d2afc55659872b82e13ebcd8fd2ada
* | | Merge "Use UI side scrolling for readOnly textareas."Leon Scroggins2011-02-251-1/+6
|\ \ \
| * | | Use UI side scrolling for readOnly textareas.Leon Scroggins2011-02-251-1/+6
| | | | | | | | | | | | | | | | | | | | Bug:3300760 Change-Id: I44641bb4ba385ece2ace9f8dba2205b76e755289
* | | | Merge "Clean up synchronisation in Texture code."Nicolas Roard2011-02-254-60/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Clean up synchronisation in Texture code.Ben Murdoch2011-02-254-60/+51
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we wait in a while loop checking the condition when we call wait, and only signal after unlocking the Mutex. Also removes mNewRequest lock and condition in the TexturesGenerator as it doesn't seem to be needed. Hopefully this will clear up some ANRs. Change-Id: I1b8b103a6effd2aa678a304e2519a6f6c484aaad
* | | Merge "Fix frameset expansion."Patrick Scott2011-02-256-188/+32
|\ \ \
| * | | Fix frameset expansion.Patrick Scott2011-02-256-188/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not expand frames that cannot scroll. Use contentsWidth and contentsHeight instead of exposing docWidth. Trigger a layout of the parent if the FrameView's layout reveals a larger content dimension. Remove iframe flattening code. Bug: 3370518 Bug: 3323913 Change-Id: I60e89caf335bfaf271f90ffd538c65f3735572da
* | | Merge "Fixed 3425519, misalignment with fixed width font"Russell Brenner2011-02-253-1/+7
|\ \ \ | |/ / |/| |
| * | Fixed 3425519, misalignment with fixed width fontRussell Brenner2011-02-243-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Uses new skia api to identify fixed width fonts. Without this fix, all Android fonts were reported as variable width, causing layout adjustment of whitespace. Now that fixed width fonts are properly reported, space characters preserve the same width as non-space chars. Change-Id: I7d83481f44e6c34fd8ae5c6638b1625d3a83a637
* | | Merge "Add a glFinish() at the end of drawGL(), to help the GPU and the ↵Nicolas Roard2011-02-241-0/+1
|\ \ \ | | | | | | | | | | | | flash plugin..."
| * | | Add a glFinish() at the end of drawGL(), to helpNicolas Roard2011-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the GPU and the flash plugin... bug:3471680 Change-Id: I436de6caea4dd5b1171f260d328dfe8170463832
* | | | Merge "Fix problem where plugins were not drawn due to an incorrect clip."Bart Sears2011-02-241-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix problem where plugins were not drawn due to an incorrect clip.Derek Sollenberger2011-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | bug: 3451982 Change-Id: If1d7bff729f72c28fec4905c3525b2f2ac1c6475
* | | | Merge "revert "Enable layers for fixed elements only for mobile websites""Teng-Hui Zhu2011-02-241-15/+2
|\ \ \ \
| * | | | revert "Enable layers for fixed elements only for mobile websites"Teng-Hui Zhu2011-02-241-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert #change,93656 Now we will use layer for fixed element in desktop site, too. Change-Id: I0a86d46f86fa75b704286aa613e967108851b990
* | | | | Merge "Update fixed layer at sync time."Teng-Hui Zhu2011-02-241-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update fixed layer at sync time.Teng-Hui Zhu2011-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the example of google news, one of the fixed position layer is under another fixed layer, and it is not updated for scrolling. The CSS value did change, but we don't have a updated fixed position call. Moving the update to sync time fix this issue. bug:3486524 Change-Id: Iecb65b37d06e65902511e569238546b49b1dcd47
* | | | | Merge "Only show video texture when frames are available."Derek Sollenberger2011-02-243-40/+101
|\ \ \ \ \
| * | | | | Only show video texture when frames are available.Derek Sollenberger2011-02-243-40/+101
| | |/ / / | |/| | | | | | | | | | | | | | | | | | bug: 3460361 Change-Id: Ifcf97b4360e0a86cfcc100e6287e1fbce8d2185a
* | | | | Stop the blinking caret when moving to another field.Leon Scroggins2011-02-242-0/+10
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:2930013 Requires a change in frameworks/base. Change-Id: I892fcdd9b9a0abdcf82e5bb26c930b68ae8b10fa
* | | | Fixed element in iframe supportTeng-Hui Zhu2011-02-243-5/+40
|/ / / | | | | | | | | | | | | | | | | | | | | | We first identify the iframe for each LayerAndroid. Then when traverse to update the fixed elements, we use the parent iframe info to update the fixed position. Change-Id: I13e0333fc6453414cea2343a787c41d525f6e3d2
* | | Merge "Skia Merge (revision 808)"Derek Sollenberger2011-02-248-27/+58
|\ \ \
| * | | Skia Merge (revision 808)Derek Sollenberger2011-02-228-27/+58
| |/ / | | | | | | | | | | | | | | | This is a companion CL to the one found in /external/skia Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa
* | | Scroll the RenderLayer during touch events.Patrick Scott2011-02-224-10/+18
|/ / | | | | | | | | | | | | | | Keep track of the owning layer for each LayerAndroid. No longer need to unadjust the node bounds since the node will be scrolled into view. Bug: 3442108 Change-Id: I7c9604d347af326ccfb86e6d3f2b95b7ce1b97c1
* | Fix potential bug in setMaxTextureCount and limitNicolas Roard2011-02-181-6/+14
| | | | | | | | | | | | the number of textures to 154 Change-Id: Ie77935015d744fcfda9bfffd751df6c7f3cd10bb