summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Don't discardQueue if the upload type didn't change" into ics-mr1John Reck2011-10-281-0/+3
|\
| * Don't discardQueue if the upload type didn't changeJohn Reck2011-10-271-0/+3
| | | | | | | | | | | | Bug: 5529012 Change-Id: I0b57c4cf9d295524f675f2cb7504d5a9c0363871
* | Merge "Keep text handles in sync with native touch targets" into ics-mr1John Reck2011-10-273-4/+46
|\ \
| * | Keep text handles in sync with native touch targetsJohn Reck2011-10-273-4/+46
| |/ | | | | | | | | | | | | | | Bug: 5522153 Also add some slop to the handle targets, cleaned up the JNI and improved debugging. Change-Id: I3b2c3c8b1543d4a1aa599ae2938fa78fe95e01bf
* | Add missing save/restore calls to GraphicsContext::fillRectBen Murdoch2011-10-271-0/+4
|/ | | | | | | | | Android is missing some calls to GraphicsContext::save/restore inside our GraphicsContext::fillRect implementations. The calls were added to the Skia GraphicsContext in http://trac.webkit.org/changeset/63102 Bug: 5361502 Change-Id: Ifcbc116d997473e3a184561102dc5cb74f5aa5ec
* Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-260-0/+0
|\
| * 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
| * | 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
| * 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 "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 "DO NOT MERGE Adjust text selection position" into ics-mr1John Reck2011-10-253-3/+12
|\ \ \
| * | | DO NOT MERGE Adjust text selection positionJohn Reck2011-10-253-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507800 Change-Id: Icfcfdb9ff019fac7e3e40df679723594fab15dc6
* | | | Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1John Reck2011-10-2514-107/+17
|\ \ \ \
| * | | | DO NOT MERGE Fix SW extras for layersJohn Reck2011-10-2514-107/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5507239 Also remove all the old, unused layer setExtras stuff Change-Id: Id1670010536712b7a9f50e74821c9fb7f708e851
* | | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
* | | | 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
* | | 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
| | * | | | Implement dual textures for layers to handle zooming correctly.Nicolas Roard2011-10-208-41/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add a new class, DualTiledTexture, that encapsulate two TiledTextures and manage them according to the current scale factor. bug:5492874 Change-Id: I4ba3ff539f9242ae5102189e9623e1535e9cc28f
* | | | | | am 458b4b11: Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '458b4b11924c3bcc70dcdd3d69f64a855870e72d': Mark tiles dirty, even if repainting
| * | | | | Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5484131 The current repainting tile could avoid being painted with the newest picture if it was repainting, since markAsDirty wouldn't change its state Change-Id: I4f3de909984d1ceb872bf294a1da211ad87c9bcc
* | | | | Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded ↵Steve Block2011-10-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | from the cache on back navigation"
| * | | | | Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the ↵Steve Block2011-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache on back navigation See http://trac.webkit.org/changeset/89982 Bug: 5480361 Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-200-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | Change-Id: I631833f425688ec28b521cf0c7ac05f5575b0997
| * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-190-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ↵John Reck2011-10-191-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr0 * commit '94cabcbdc194d4a28d31cfb82be98a287b8cf1c9': Force a navcache update before requesting keyboard
| * | | | | | Merge "Force a navcache update before requesting keyboard" into ics-mr0John Reck2011-10-191-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Force a navcache update before requesting keyboardJohn Reck2011-10-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5453541 Change-Id: I209d96d6cd567f7d548549e3e9e5004df045226b
* | | | | | | am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" ↵Chris Craik2011-10-191-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '81fab713750af480b451fbd9926b7d76b7017551': Mark tiles dirty when discarded from transfer queue
| * | | | | | Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0Chris Craik2011-10-191-1/+6
| |\ \ \ \ \ \
generated by cgit v1.1 at 2024-09-19 23:19:11 +0000