summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use the transformed clipping rect for media layers (flash plugin)" ↵Bart Sears2011-11-151-1/+2
|\ | | | | | | into ics-mr1
| * Use the transformed clipping rect for media layers (flash plugin)Nicolas Roard2011-11-151-1/+2
| | | | | | | | | | bug:5621574 Change-Id: I4e2925edc314872a628b81daffe4ab1be7fe366f
* | Fix text selection handle positioningJohn Reck2011-11-153-3/+14
|/ | | | | | Bug: 5620362 Change-Id: Ic75ba855b5b86f8b0c3a21ee5dcbcc92b0dc982a
* Only mark tiles as dirty if the inval region actually intersectsNicolas Roard2011-11-141-0/+24
| | | | | bug:5553084 Change-Id: Ic5cf86ff8f53e86fca9ae98745d9556eadc7f8d2
* Use a single shared bitmap instead of one per BaseTile.Nicolas Roard2011-11-142-10/+15
| | | | | | | | | | | CL https://android-git.corp.google.com/g/#/c/148708/ uncovered an existing memory leak on BaseTile. As we now keep the bitmap around, this triggers an OOM. We still need to track down the BaseTile leak, but at least with this CL we won't OOM (and it's also using less memory...) bug:5613031 Change-Id: Iac56d3b5c408b5e3e87c0f621e227bd3f4e37c3d
* Merge "Enable SPDY protocol." into ics-mr1Selim Gurun2011-11-111-2/+1
|\
| * Enable SPDY protocol.Selim Gurun2011-11-101-2/+1
| | | | | | | | | | | | | | | | Bug: 5524112 Reenable SPDY protocol. Change-Id: I0144791020b64e20a12b7cd45ac2427100bef8a7 Signed-off-by: Selim Gurun <sgurun@google.com>
* | Remove inset for WebTextViewMichael Kolb2011-11-111-2/+2
| | | | | | | | | | | | | | Bug: 5383911 By removing the inset we cover webkit's text field completely Change-Id: Ib3edf21beb4e26b38b2195a9e336523336f26eb7
* | Merge "Fix combobox metrics and asset scaling" into ics-mr1Michael Kolb2011-11-113-17/+40
|\ \
| * | Fix combobox metrics and asset scalingMichael Kolb2011-11-103-17/+40
| | | | | | | | | | | | | | | | | | Bug: 5521553 Change-Id: I630eda2ffd90d0c986f00c5a2a4b523e93537192
* | | Merge "Fallback mode when running out of textures for layers" into ics-mr1Nicolas Roard2011-11-1019-99/+588
|\ \ \
| * | | Fallback mode when running out of textures for layersNicolas Roard2011-11-1019-99/+588
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Implements a degraded rendering mode when running out of textures - Speed up rendering by reusing the same SkBitmap in RasterRenderer - Some refactoring bug:5279231 Change-Id: I52943a87bed56c49b01b47fea4fa1a5c49e09e93
* | | | Merge "Use anti-aliasing in prefetch tiles" into ics-mr1Chris Craik2011-11-101-2/+2
|\ \ \ \
| * | | | Use anti-aliasing in prefetch tilesChris Craik2011-11-101-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | bug:5534278 Change-Id: I5929752a9edcf3cd1c51360e0dc4d8df6ae6bb1e
* | | | Merge "Fix CTS regressions from merge to r74534." into ics-mr1Ben Murdoch2011-11-101-2/+0
|\ \ \ \
| * | | | Fix CTS regressions from merge to r74534.Ben Murdoch2011-11-101-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit change http://trac.webkit.org/changeset/73385 removed overflow dimensions from the calculation of layer dimensions. This means that the optimisation inside the nav cache to skip building a frame cache when one of the layer dimensions is 0 is no longer valid (as the layer may contain only overflow content). Bug: 5572431 Change-Id: I3c973ad1ed57b07217d19f5d4fba7bfe522a2165
* | | | Merge "Support pausing drawing" into ics-mr1John Reck2011-11-101-1/+11
|\ \ \ \
| * | | | Support pausing drawingJohn Reck2011-11-091-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5594608 Change-Id: I09590f8c04904957b079f0458022b960599eb47a
* | | | | Merge "DO NOT MERGE Offset scroll area by the scroll origin on Android" into ↵George Mount2011-11-103-11/+39
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | ics-mr1
| * | | | DO NOT MERGE Offset scroll area by the scroll origin on AndroidGeorge Mount2011-11-093-11/+39
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5268793 The scrolled area for WebView is 0,0 - maxX,maxY while ScrollView can have any origin. On RTL pages, the origin is negative when it can scroll. This scrolls the page to the right when it detects an RTL page. Cherry-picked from master CL: I6a91b97f Framework CL: I2537b84a Change-Id: I6a91b97f90f5ba4c323c56dda9d125108d9502c4
* | | | Merge "Fix font size handling for harfbuzz hack" into ics-mr1Russell Brenner2011-11-091-10/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix font size handling for harfbuzz hackRussell Brenner2011-11-081-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complex languages (Arabic, Thai, etc.) currently need to override the base font (e.g. Roboto) with an explicitly loaded copy of the right fallback font (e.g. DroidNaskh). To keep from running out of file descriptors, a caching mechanism was put in place, but the cached data contained the font size, so the first size seen on the page was applied to all subsequent renderings of that font, regardless of the size requested. Size is now also considered in the cache. Bug: 5509443 Change-Id: I616954980122e89da14ce86efe99d5e4343a40c2
* | | | Merge "Add support for Bengali and Tamil gpos/gsub tables" into ics-mr1Russell Brenner2011-11-091-13/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add support for Bengali and Tamil gpos/gsub tablesRussell Brenner2011-11-091-13/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | HB_Script_Bengali and HB_Script_Tamil are now recognized in FontAndroid.cpp and map to Lohit-Bengali.ttf and Lohit-Tamil.ttf, allowing Harfbuzz to properly load the gpos/gsub tables for those languages. Bug: 5578901 Change-Id: I20ed542dd5a616535222dcb5c808f3716a062e80
* | | Merge "Revert crash on bad scale - do not merge" into ics-mr1Bart Sears2011-11-081-3/+1
|\ \ \ | |_|/ |/| |
| * | Revert crash on bad scale - do not mergeBart Sears2011-11-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | bug:5367327 Cherry pick of: dc193f393a845e88f55ecf0055386fc4e4204537 Change-Id: Iea6e4a564fc003d8e2ad8e1d6d9d9b64d016e43d
* | | Merge "Add necessary null pointer check to avoid crash on youtube video" ↵Teng-Hui Zhu2011-11-081-0/+4
|\ \ \ | |/ / |/| | | | | into ics-mr1
| * | Add necessary null pointer check to avoid crash on youtube videoTeng-Hui Zhu2011-11-081-0/+4
| | | | | | | | | | | | | | | bug:5562347 Change-Id: I9b53a58137d70955bde5334c7c8b581343a8c2ce
* | | Merge "Fix extras clipping" into ics-mr1John Reck2011-11-072-3/+2
|\ \ \
| * | | Fix extras clippingJohn Reck2011-11-072-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5556494 Change-Id: I82e8282271dfc623afa9b1ef0d0061ca9c3df5f4
* | | | Merge "Change the default webView behavior to minimize the memory ↵Teng-Hui Zhu2011-11-074-6/+26
|\ \ \ \ | |/ / / |/| / / | |/ / consumption" into ics-mr1
| * | Change the default webView behavior to minimize the memory consumptionTeng-Hui Zhu2011-11-074-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we just limit the expansion on x and y direction. In the future, we need to dynamically allocate and deallocate the memory. browser change is : c/148242 bug:5522175 Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727
* | | Remove the global button lockJohn Reck2011-11-0711-296/+20
| |/ |/| | | | | | | | | | | Bug: 5558699 Bug: 5572238 Change-Id: Ic199ffda5bc4aa09d39ee54221c6fcce6a91ca05
* | Merge "Doesn't lock the entire drawing..." into ics-mr1Nicolas Roard2011-11-073-5/+9
|\ \
| * | Doesn't lock the entire drawing...Chris Craik2011-11-043-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused us to potentially waiting on the completion of a tile painting. On sites where skia struggle with, this had a large impact on scrolling performances. This is only part one of the solution -- we need to also get rid of the global button lock. We also lower the priority of the texture gneeration thread. bug:5558699 Change-Id: I251354d6cabb2fd7ebfd665c30eff7fe90c3d316
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ | |/ / |/| | | | | Change-Id: If02ce708d74c5d627e4e6f83cfc5ee003fb42b58
| * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-040-0/+0
| |\ \
* | \ \ am 55b5da34: (-s ours) Merge "Don\'t force composited layers to be stacking ↵Bart Sears2011-11-040-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | contexts - DO NOT MERGE" into ics-mr0 * commit '55b5da341a376006b2e0ab9cc6dfba5a76c65c7c': Don't force composited layers to be stacking contexts - DO NOT MERGE
| * | | Merge "Don't force composited layers to be stacking contexts - DO NOT MERGE" ↵Bart Sears2011-11-031-1/+1
| |\ \ \ | | | | | | | | | | | | | | | into ics-mr0
| | * | | Don't force composited layers to be stacking contexts - DO NOT MERGEChris Craik2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick of c0fb399b4644c319c15e0a6a7e0f6c29917d9099 bug:5264240 Was causing crashes, and layer ordering problems. Change-Id: Ieecff6d64405f13b459ea013da2a309b00077d47
* | | | | am 209db4d4: (-s ours) Fix plugin rendering bug when video surface is not ↵Derek Sollenberger2011-11-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ready. do not merge * commit '209db4d462bfff0c9f13896f72611a82c2c6639c': Fix plugin rendering bug when video surface is not ready. do not merge
| * | | | Fix plugin rendering bug when video surface is not ready. do not mergeDerek Sollenberger2011-11-031-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of bf6900fe796a697400203ab777001716f3d83a0a The browser incorrectly jumps out of the compositing step for a plugin early if it detects a video surface is not ready. The correct behavior is to skip rendering the video and proceed to rendering the other plugin contents. bug: 5525272 Change-Id: I12acb477890303d03c99ffa13729fd7e7eefc800
* | | | Fix crash in Autofill.Ben Murdoch2011-11-031-7/+9
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Fix a crash in autofill that can be caused by toggling the setting on and off. Bug: 5452927 Change-Id: I80ba0b823fd16cb4e2df3359be95f3d063a9b091
* | | Report a load error when network loads blocked. Do not mergeBen Murdoch2011-10-314-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from master. When network loads are blocked, we should fail those loads rather than leaving them dangling. In particular, this fixes an issue where WebCore will wait to do the first layout while CSS loads are pending. If network loads are blocked, we need to tell WebCore they are never going to complete. To implement this, we make use of the Chromium stack's load flags and move the code to a more suitable location. Bug: 5416543 Change-Id: I4bd9987611364b29d3ccaa50437d418a5eb9a5cd
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-280-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I50da917e834f4ba4e0ba3e43e5af0ce523a706a4
| * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | |\
* | | \ Merge "Fix plugin rendering bug when video surface is not ready." into ics-mr1Derek Sollenberger2011-10-281-1/+1
|\ \ \ \
| * | | | Fix plugin rendering bug when video surface is not ready.Derek Sollenberger2011-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The browser incorrectly jumps out of the compositing step for a plugin early if it detects a video surface is not ready. The correct behavior is to skip rendering the video and proceed to rendering the other plugin contents. bug: 5525272 Change-Id: Id838f6cef4913e817f58bf2b7e17d871f9f0250e
* | | | | Merge "Don't discardQueue if the upload type didn't change" into ics-mr1John Reck2011-10-281-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |