summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c43f9396: Merge "Don\'t draw prefetch page if not necessary" into ics-mr1Chris Craik2011-10-264-23/+33
|\ | | | | | | | | * commit 'c43f9396708d95ecbce1f4ef65530999fab96c0d': Don't draw prefetch page if not necessary
| * Merge "Don't draw prefetch page if not necessary" into ics-mr1Chris Craik2011-10-254-23/+33
| |\
| | * Don't draw prefetch page if not necessaryChris Craik2011-10-254-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | bug:5494086 Also only try to draw visible tiles. Change-Id: Ic850afab94309d9d4d031600a40dc889298fef24
* | | am d0e47e8b: Take scale into account when greedily prefetching an entire layerChris Craik2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'd0e47e8be77bfe2991172ca5aa04fbac8d484357': Take scale into account when greedily prefetching an entire layer
| * | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5509149 Scale wasn't being taken into account when estimating layer tile consumption, so zooming in on layer content could attempt to fetch and draw hundreds of layers per tile, causing lots of missing content. Change-Id: Ib26e203827ad93be12d29561b9d8094cb712f014
* | | am affc0848: SwapLayersTextures on all layer changesChris Craik2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'affc08488bcc3fc9ae25d5199890d8e2f0cdb8bb': SwapLayersTextures on all layer changes
| * | SwapLayersTextures on all layer changesChris Craik2011-10-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5507262 This restores behavior, and allows a single setBaseLayer to set content (such as is used in browser saved pages). Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c
* | | am 9bcbd1be: Mark layers as ready to swap if invisibleChris Craik2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '9bcbd1be99f8033fe90e903b41a29a24dbf3616d': Mark layers as ready to swap if invisible
| * | Mark layers as ready to swap if invisibleChris Craik2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5505364 This avoids the problem of waiting infinitely during initialization (when a layer doesn't have content) for the layer to be ready. Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b
* | | am 3528cb86: Remove unnecessary logNicolas Roard2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3528cb86ca5faa67fb43f8cedb5437e3cb2c8b9f': Remove unnecessary log
| * | Remove unnecessary logNicolas Roard2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | CL https://android-git.corp.google.com/g/#/c/144158/ introduced a debug log that we don't need, spamming logcat Change-Id: Iea8a1784153dd9f6f53e67f7cb62504440344c7c
* | | am c0fb399b: (-s ours) Don\'t force composited layers to be stacking ↵Chris Craik2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | contexts - DO NOT MERGE * commit 'c0fb399b4644c319c15e0a6a7e0f6c29917d9099': Don't force composited layers to be stacking contexts - DO NOT MERGE
| * | Don't force composited layers to be stacking contexts - DO NOT MERGEChris Craik2011-10-251-1/+1
| |/ | | | | | | | | | | | | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Cherry-pick of b8c237486bcf299d8a04bdae8d8e35fd37866172 Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-2513-84/+84
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I821098330652380686aca9e83222936bd5678970
* | Merge "Report a load error when network loads blocked."Ben Murdoch2011-10-254-19/+26
|\ \
| * | Report a load error when network loads blocked.Ben Murdoch2011-10-254-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I0bd41e430c7ab3cefa302ed0e0576c7e74e7274a
* | | Merge "Adjust text selection position"John Reck2011-10-253-3/+12
|\ \ \
| * | | Adjust text selection positionJohn Reck2011-10-243-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507800 Change-Id: Ifed5cae83a66170dcf1a20789642ffc3d9654050
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-250-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Iae39b4a8afcd9ee02bc294553d1d8a696cee7cda
| * \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ \
* | \ \ \ \ am 0d4258e7: Merge "Take scale into account when greedily prefetching an ↵Chris Craik2011-10-241-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entire layer" into ics-mr0 * commit '0d4258e78caa860491a4c9e6965e574dabc3ec63': Take scale into account when greedily prefetching an entire layer
| * | | | | Merge "Take scale into account when greedily prefetching an entire layer" ↵Chris Craik2011-10-241-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5509149 Scale wasn't being taken into account when estimating layer tile consumption, so zooming in on layer content could attempt to fetch and draw hundreds of layers per tile, causing lots of missing content. Change-Id: Ib26e203827ad93be12d29561b9d8094cb712f014
* | | | | | | am bee2599e: SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bee2599ec82af8aaf47491b6aea4ee07a377c81a': SwapLayersTextures on all layer changes
| * | | | | | SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5507262 This restores behavior, and allows a single setBaseLayer to set content (such as is used in browser saved pages). Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I53b2681a987f4f686a16b5e5a1d62a773604fe77
| * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am a4adfec4: Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | | * commit 'a4adfec4837fe35c27bbee2963cbc105dbce38ff': Mark layers as ready to swap if invisible
| * | | | | Merge "Mark layers as ready to swap if invisible" into ics-mr0Chris Craik2011-10-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Mark layers as ready to swap if invisibleChris Craik2011-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5505364 This avoids the problem of waiting infinitely during initialization (when a layer doesn't have content) for the layer to be ready. Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b
* | | | | | Merge "Fix SW extras for layers"John Reck2011-10-2414-107/+17
|\ \ \ \ \ \
| * | | | | | Fix SW extras for layersJohn Reck2011-10-2414-107/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507239 Also remove all the old, unused layer setExtras stuff Change-Id: I6b319192fac4c8ce0995bc7883f64fc482beff05
* | | | | | | am d436d4c3: Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'd436d4c3e6b088f1fcae26dc4835e28065f017a8': Remove unnecessary log
| * | | | | Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove unnecessary logNicolas Roard2011-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL https://android-git.corp.google.com/g/#/c/144158/ introduced a debug log that we don't need, spamming logcat Change-Id: Iea8a1784153dd9f6f53e67f7cb62504440344c7c
* | | | | | Merge "Don't force composited layers to be stacking contexts"Chris Craik2011-10-241-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Don't force composited layers to be stacking contextsChris Craik2011-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: If0751cf1dcf857e8e01b65bf347690292b4d0645
| * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 5dee9ed2: Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5dee9ed228c914254062b62ae459884e3060a2ae': Cherry pick 97075
| * | | | | | Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
| |\ \ \ \ \ \
| | * | | | | | Cherry pick 97075John Reck2011-10-204-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5491444 Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088
* | | | | | | | am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5236e6a2f70997cf9dec9e93261867dd79b21738': Cherry pick 94857
| * | | | | | | Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | Cherry pick 94857John Reck2011-10-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5491573 Change-Id: I32666ca6abdc2e224e6b9727f65e62fd3bd10859
* | | | | | | Merge "WebKit part of fix for bug 5307956"Kristian Monsen2011-10-211-21/+18
|\ \ \ \ \ \ \
| * | | | | | | WebKit part of fix for bug 5307956Kristian Monsen2011-10-191-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the cache directory is an empty string, create an in-memory cache instead. Also cleared up the storage directory logic. It should only be called once for each app now, so removed the caching and merged the two functions. Change-Id: Id9f179b5722425d1808f7d784d1071dee7aec6bc
* | | | | | | | am 6032fa42: Merge "Implement dual textures for layers to handle zooming ↵Nicolas Roard2011-10-208-41/+175
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | correctly." into ics-mr0 * commit '6032fa428d725097ea29fc85fc1b2c965094772b': Implement dual textures for layers to handle zooming correctly.
| * | | | | | Merge "Implement dual textures for layers to handle zooming correctly." into ↵Nicolas Roard2011-10-208-41/+175
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | ics-mr0
generated by cgit v1.1 at 2024-09-14 04:29:04 +0000