summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix over-allocation of memory on text with shadows."Derek Sollenberger2011-11-171-0/+4
|\
| * Fix over-allocation of memory on text with shadows.Derek Sollenberger2011-11-171-0/+4
| | | | | | | | | | bug: 5607514 Change-Id: I6bf0ee814a3819f1dfb79484143f88dd6c95ca71
* | Merge "Fix one memory leak only in DEBUG mode"Teng-Hui Zhu2011-11-171-0/+3
|\ \
| * | Fix one memory leak only in DEBUG modeTeng-Hui Zhu2011-11-161-0/+3
| | | | | | | | | | | | | | | | | | We should always delete the temporary pixels. Change-Id: Idc4cf939cf3a50ddb557d544deb911c64b0547df
* | | Merge "Audit misuse of PassRefPtr"Russell Brenner2011-11-174-13/+13
|\ \ \
| * | | Audit misuse of PassRefPtrRussell Brenner2011-11-164-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed Android code for misuse of PassRefPtr in place of RefPtr. Also reviewed for PassOwnPtr and found no apparent misuse. Bug: 5631569 Change-Id: Ib22b340875b1d875091af47cef6510d9c63e351b
* | | | Merge "Use RefPtr instead of PassRefPtr for WebHistory"Russell Brenner2011-11-171-20/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use RefPtr instead of PassRefPtr for WebHistoryRussell Brenner2011-11-161-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In read_item_recursive, there are two instances of PassRefPtr which, according to docs at http://www.webkit.org/coding/RefPtr.html, should rather be RefPtr. Bug: 5143832 Change-Id: Id8315d3d67de9e0dfc24bd70fdc0b6ef4a25a8a1
* | | | am 8e484c2c: Fix clipping issue causing the layers to disappear when IME is upNicolas Roard2011-11-171-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '8e484c2c48a30e5af7553f32312cd4d765fb3417': Fix clipping issue causing the layers to disappear when IME is up
| * | | | Fix clipping issue causing the layers to disappear when IME is upNicolas Roard2011-11-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5622291 Change-Id: I0134b784092b8e3910fcabf3e647034eb31096c7
* | | | | Merge "Remove changes with upstream WebKit"Kristian Monsen2011-11-173-7/+2
|\ \ \ \ \
| * | | | | Remove changes with upstream WebKitKristian Monsen2011-11-173-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 5626884, removing some small changes with upstream that was spotted as part of CL: https://android-git.corp.google.com/g/#/c/148917 No functional difference. Change-Id: I62c8a24e17c3ab86eebff997b87e5bced88e0807
* | | | | | Merge "Removing ANDROID_INSTRUMENTATION code"Kristian Monsen2011-11-1742-1325/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | am d34224ca: Merge "Promote -ve z-index fixed/scrollable elements to layers" ↵Ben Murdoch2011-11-171-0/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'd34224ca67791aa7215160c7be4900f965f79eea': Promote -ve z-index fixed/scrollable elements to layers
| * | | | | Merge "Promote -ve z-index fixed/scrollable elements to layers" into ics-mr1Ben Murdoch2011-11-161-0/+11
| |\ \ \ \ \
| | * | | | | Promote -ve z-index fixed/scrollable elements to layersBen Murdoch2011-11-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We normally do not necessarily promote fixed or scrollable elements to compositing layers to try and reduce the number of layers that get created. However in the case that such an element appears in the negative z-order, we must do the promotion to ensure that the layer is painted at the correct z-index in the hierarchy (i.e not too high - sites like to use a fixed image with z-index:-1 to implement a fixed background -- without this patch we end up painting the background over the main page content). Bug: 5152567 Change-Id: I36bfe14660a33d45ad54552ae41b9d7157f8dabf
* | | | | | | am d6945dd4: Merge "Position WebTextView correctly on layers" into ics-mr1Michael Kolb2011-11-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * commit 'd6945dd4dc2d427a38d75cde40767fce404f69fc': Position WebTextView correctly on layers
| * | | | | Merge "Position WebTextView correctly on layers" into ics-mr1Michael Kolb2011-11-161-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Position WebTextView correctly on layersMichael Kolb2011-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5550648 Change-Id: If3d59e0d197e9383b64f6a9e17d94e022044b5c3
* | | | | | 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
| |\ \ \ \ \
generated by cgit v1.1 at 2024-09-14 11:30:51 +0000