summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-1742-1325/+16
| | | | | | | | | | | | | | This has not been used for years, and due to WebKit merges the results are not accurate anymore. The resulting code is cleaner, less likely to create merge conflicts, and does not give the impression that this can be turned on and it will still work. Needs CL: https://android-git.corp.google.com/g/#/c/148912/ Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
* Merge "Fix Java Bridge when coercing JavaScript string to Java char in arrays"Steve Block2011-11-161-18/+10
|\
| * Fix Java Bridge when coercing JavaScript string to Java char in arraysSteve Block2011-11-151-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when converting coercing a JavaScript string to a method parameter of type Java char, we always use a value of 0. However, when coercing a JavaScript object to method parameter of type Java char array, we behave differently. In this case, if the element is a JavaScript string, we use the first character of the string for the char value. This change modifies the behaviour in the array case to match that in the non-array case. Bug: 5619677 Change-Id: Ifeee8940af0bb01df58eeff6c9dd7e1b40688790
* | am 73a306c4: Merge "Fix CacheManager to correctly write CacheFiles to disk." ↵Ben Murdoch2011-11-162-6/+6
|\ \ | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '73a306c4d2dd650b9a083deb6362fc6ba3cf9032': Fix CacheManager to correctly write CacheFiles to disk.
| * \ Merge "Fix CacheManager to correctly write CacheFiles to disk." into ics-mr1Ben Murdoch2011-11-162-6/+6
| |\ \
| | * | Fix CacheManager to correctly write CacheFiles to disk.Ben Murdoch2011-11-152-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems with the CacheManager - 1. Need to null terminate the file path used for the cache file on disk. 2. A race condition between starting the background task to write the file and updating internal state variables. These were causing a CTS test to fail. Bug: 5619303 Change-Id: I61f06d50b7ef560ede2f1141fc51d92255d4efbd
* | | | am fbcfce66: Merge "Use the transformed clipping rect for media layers ↵Bart Sears2011-11-151-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | (flash plugin)" into ics-mr1 * commit 'fbcfce665f9a8c223c49f77eb04a407404f64ec8': Use the transformed clipping rect for media layers (flash plugin)
| * | | 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
* | | | am 29244862: Fix text selection handle positioningJohn Reck2011-11-153-3/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '292448625cf74fa0cbb6776572d5b116d2e7eb15': Fix text selection handle positioning
| * | | Fix text selection handle positioningJohn Reck2011-11-153-3/+14
| |/ / | | | | | | | | | | | | | | | Bug: 5620362 Change-Id: Ic75ba855b5b86f8b0c3a21ee5dcbcc92b0dc982a
* | | Merge "Mask display of zero-width characters"Russell Brenner2011-11-151-1/+6
|\ \ \
| * | | Mask display of zero-width charactersRussell Brenner2011-11-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated TextRunWalker::getNormalizedTextRun() to use newer Font API handling both regular and zero width space characters. Bug: 5436040 Change-Id: I534641d057c914d18582c0041e85b5df1b457bcc
* | | | am 61a90836: Only mark tiles as dirty if the inval region actually intersectsNicolas Roard2011-11-151-0/+24
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '61a908361c8a96eeb70afdb5430e89845edb2bdd': Only mark tiles as dirty if the inval region actually intersects
| * | | Only mark tiles as dirty if the inval region actually intersectsNicolas Roard2011-11-141-0/+24
| | | | | | | | | | | | | | | | | | | | bug:5553084 Change-Id: Ic5cf86ff8f53e86fca9ae98745d9556eadc7f8d2
* | | | am 4c64d282: Use a single shared bitmap instead of one per BaseTile.Nicolas Roard2011-11-142-10/+15
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * commit '4c64d282bac19cea4612c86ed79803ad09abb5fb': Use a single shared bitmap instead of one per BaseTile.
| * | 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 "Fix for bug 5594865: Network error"Kristian Monsen2011-11-141-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix for bug 5594865: Network errorKristian Monsen2011-11-141-0/+1
| | | | | | | | | | | | | | | | | | Using ERROR_CONNECT for ERR_CACHE_MISS Change-Id: I27c089c01e5df1d3b77f719862552328eb1f53ce
* | | am 7c2e38b6: Merge "Enable SPDY protocol." into ics-mr1Selim Gurun2011-11-111-2/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '7c2e38b61270efe55f065d765228ace66b54f169': Enable SPDY protocol.
| * | 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>
* | | | am e5c39206: Remove inset for WebTextViewMichael Kolb2011-11-111-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e5c39206de45588678bf718a8274432068d702f6': Remove inset for WebTextView
| * | | 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
* | | | am 0de683c1: Merge "Fix combobox metrics and asset scaling" into ics-mr1Michael Kolb2011-11-113-17/+40
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0de683c1b300c8e788c178c63b7dc71189c0a3d8': Fix combobox metrics and asset scaling
| * | | 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 "Fix the scale for complex script fonts and re-ajust y position."claireho2011-11-113-20/+45
|\ \ \ \ \
| * | | | | Fix the scale for complex script fonts and re-ajust y position.claireho2011-11-103-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5445861 : complex joining characters positioned in wrong place. 1. Set font size and scale for harfbuzz object based on Chrome's CL:http://trac.webkit.org/changeset/77504. 2. Truncate harfbuzz value to pixels for y position. 3. Ran through the page_cycler/intl2 tests with 5 iterations. Change-Id: I38dcb07b2d23042e40781ea914c8c6e73f33c220
* | | | | | am f5131505: Merge "Fallback mode when running out of textures for layers" ↵Nicolas Roard2011-11-1119-99/+588
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'f51315051fbfa03d02d8c098ae70e9eb227d4200': Fallback mode when running out of textures for layers
| * | | | | 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
* | | | | | | am bbffb087: Merge "Use anti-aliasing in prefetch tiles" into ics-mr1Chris Craik2011-11-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bbffb087457241fb32b7bf6327323f5c2695f8f7': Use anti-aliasing in prefetch tiles
| * | | | | | 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
* | | | | | | am 1067d8e6: Merge "Fix CTS regressions from merge to r74534." into ics-mr1Ben Murdoch2011-11-101-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | * commit '1067d8e648ceae4db56ce5cc2b3dac1786d557d1': Fix CTS regressions from merge to r74534.
| * | | | | 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
* | | | | | am 9074815a: Merge "Support pausing drawing" into ics-mr1John Reck2011-11-101-1/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9074815a647bc5401963370e16b71e758fc3f550': Support pausing drawing
| * | | | | 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 assertion message."George Mount2011-11-101-1/+2
|\ \ \ \ \ \
| * | | | | | Fix assertion message.George Mount2011-11-101-1/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5598631 The assertion message was misleading. This corrects it. Change-Id: Ic609804ebac09e6d92fa11dc078aad62126b8690
* | | | | | resolved conflicts for merge of 5d8f08b9 to masterRussell Brenner2011-11-101-10/+15
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Change-Id: Idc88ff5f613a7c8f771b067f4a01967a32ede276
| * | | | 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
* | | | | am 7c7fadae: Merge "Add support for Bengali and Tamil gpos/gsub tables" into ↵Russell Brenner2011-11-101-13/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '7c7fadaed03fc262d86394fc08ae3948ebc904e1': Add support for Bengali and Tamil gpos/gsub tables
| * | | | Merge "Add support for Bengali and Tamil gpos/gsub tables" into ics-mr1Russell Brenner2011-11-091-13/+23
| |\ \ \ \ | | |_|_|/ | |/| | |
generated by cgit v1.1 at 2024-07-06 12:12:23 +0000