summaryrefslogtreecommitdiffstats
Commit message (Expand)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
* | 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
| |/
* | Add missing save/restore calls to GraphicsContext::fillRectBen Murdoch2011-10-271-0/+4
|/
* 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" int...Chris Craik2011-10-241-2/+2
| |\
| | * Take scale into account when greedily prefetching an entire layerChris Craik2011-10-241-2/+2
| * | SwapLayersTextures on all layer changesChris Craik2011-10-241-2/+1
| |/
| * 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
| * | Merge "Remove unnecessary log" into ics-mr0Bart Sears2011-10-241-1/+1
| |\ \ | | |/ | |/|
| | * Remove unnecessary logNicolas Roard2011-10-231-1/+1
* | | 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
* | | | 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
* | | | | 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
| |/ / / /
* | | | | Take scale into account when greedily prefetching an entire layerChris Craik2011-10-251-2/+2
* | | | | SwapLayersTextures on all layer changesChris Craik2011-10-251-2/+1
* | | | | Mark layers as ready to swap if invisibleChris Craik2011-10-251-1/+1
* | | | | Remove unnecessary logNicolas Roard2011-10-251-1/+1
| |/ / / |/| | |
* | | | Don't force composited layers to be stacking contexts - DO NOT MERGEChris Craik2011-10-251-1/+1
|/ / /
* | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \
| * \ \ 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
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Cherry pick 97075" into ics-mr0John Reck2011-10-214-27/+15
| |\ \ \ \
| | * | | | Cherry pick 97075John Reck2011-10-204-27/+15
* | | | | | am 5236e6a2: Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Cherry pick 94857" into ics-mr0John Reck2011-10-211-2/+7
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Cherry pick 94857John Reck2011-10-201-2/+7
* | | | | 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
* | | | | | am 6032fa42: Merge "Implement dual textures for layers to handle zooming corr...Nicolas Roard2011-10-208-41/+175
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Implement dual textures for layers to handle zooming correctly." into ...Nicolas Roard2011-10-208-41/+175
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Implement dual textures for layers to handle zooming correctly.Nicolas Roard2011-10-208-41/+175
* | | | | | am 458b4b11: Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Mark tiles dirty, even if repaintingChris Craik2011-10-201-3/+4
| | |_|/ / | |/| | |
* | | | | Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded fro...Steve Block2011-10-201-1/+1
|\ \ \ \ \
| * | | | | Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the c...Steve Block2011-10-191-1/+1
* | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-200-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into...Chris Craik2011-10-191-1/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0Chris Craik2011-10-191-1/+6
| |\ \ \ \ \ \