summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | am 9c0e7d80: Merge "Fix WebViewCore::createBaseLayer() to always do a layout ...Steve Block2011-11-291-8/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Fix WebViewCore::createBaseLayer() to always do a layout and paint the...Steve Block2011-11-291-8/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix WebViewCore::createBaseLayer() to always do a layout and paint the backgr...Steve Block2011-11-241-8/+6
* | | | | | | | am 64797036: Merge "Put canvas on a layer" into ics-mr1John Reck2011-11-282-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Put canvas on a layer" into ics-mr1John Reck2011-11-282-1/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Put canvas on a layerJohn Reck2011-11-282-1/+7
* | | | | | | | am 7bfb8097: Merge "Display media layers even if we ran out of layers texture...Nicolas Roard2011-11-283-6/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge "Display media layers even if we ran out of layers textures" into ics-mr1Nicolas Roard2011-11-283-6/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Display media layers even if we ran out of layers texturesNicolas Roard2011-11-233-6/+10
| | |/ / / /
* | | | | | am 7839f0a8: Fix SVG text renderingSteve Block2011-11-242-4/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix SVG text renderingSteve Block2011-11-242-4/+25
| |/ / / /
* | | | | Only log from notImplemented() in debug buildsSteve Block2011-11-244-15/+4
* | | | | Merge "Defer CookieManager initialization."Selim Gurun2011-11-232-14/+38
|\ \ \ \ \
| * | | | | Defer CookieManager initialization.Selim Gurun2011-11-232-14/+38
| | |_|/ / | |/| | |
* | | | | am 3eaf0f8c: Force layers above overscroll/fixed elements to compositeChris Craik2011-11-231-8/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Force layers above overscroll/fixed elements to compositeChris Craik2011-11-221-8/+0
| | |_|/ | |/| |
* | | | Merge "Move Android specific code inside the ANDROID_META_SUPPORT ifdef."Mangesh Ghiware2011-11-231-1/+1
|\ \ \ \
| * | | | Move Android specific code inside the ANDROID_META_SUPPORT ifdef.Mangesh Ghiware2011-11-221-1/+1
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| |\ \ \ \
* | \ \ \ \ Merge "Fix for bug 5152544, reduce warnings in external/webkit"Kristian Monsen2011-11-221-1/+1
|\ \ \ \ \ \
| * | | | | | Fix for bug 5152544, reduce warnings in external/webkitKristian Monsen2011-11-221-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | am bd996ca3: Merge "Use isHighEndGfx to double textures" into ics-mr1John Reck2011-11-214-6/+14
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge "Use isHighEndGfx to double textures" into ics-mr1John Reck2011-11-214-6/+14
| |\ \ \ \ \
| | * | | | | Use isHighEndGfx to double texturesJohn Reck2011-11-214-6/+14
| | | |/ / / | | |/| | |
* | | | | | Fix JavaBridge to handle overflow of array lengthSteve Block2011-11-211-5/+10
* | | | | | am 67e60576: Merge "Set the number of current textures depending on the layer...Nicolas Roard2011-11-215-17/+79
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge "Set the number of current textures depending on the layers' count, to ...Nicolas Roard2011-11-215-17/+79
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Set the number of current textures depending on the layers' count,Nicolas Roard2011-11-185-17/+79
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | |\ \ \ \
| | | | * | | | Use a single shared bitmap instead of one per BaseTile.Nicolas Roard2011-11-142-10/+15
| | | | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | |\ \ \ \
* | | | | \ \ \ \ am 59b140f3: Merge "Content and viewport rects set in one step." into ics-mr1Bart Sears2011-11-181-88/+71
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge "Content and viewport rects set in one step." into ics-mr1Bart Sears2011-11-181-88/+71
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Content and viewport rects set in one step.George Mount2011-11-161-88/+71
* | | | | | | | | | am e2e7333b: Merge "Only allow stacking contexts to skip compositing" into ic...Bart Sears2011-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Only allow stacking contexts to skip compositing" into ics-mr1Bart Sears2011-11-171-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Only allow stacking contexts to skip compositingChris Craik2011-11-171-1/+1
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 4b6100af: Merge "Force tiles to swap whenever drawing tree is ready" into ...Chris Craik2011-11-171-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Force tiles to swap whenever drawing tree is ready" into ics-mr1Chris Craik2011-11-171-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Force tiles to swap whenever drawing tree is readyChris Craik2011-11-161-1/+1
| | |/ / / / / / /
* | | | | | | | | am 7fd7178c: Merge "Add logging to help debug an ANR" into ics-mr1Teng-Hui Zhu2011-11-171-4/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add logging to help debug an ANR" into ics-mr1Teng-Hui Zhu2011-11-171-4/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add logging to help debug an ANRTeng-Hui Zhu2011-11-161-4/+10
| | | |/ / / / / | | |/| | | | |
* | | | | | | | resolved conflicts for merge of 4eaaa2a0Chris Craik2011-11-1731-738/+1420
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "synchronous layer updates, and animation deferral during paint" into i...Chris Craik2011-11-1631-738/+1420
| |\ \ \ \ \ \ \
| | * | | | | | | synchronous layer updates, and animation deferral during paintChris Craik2011-11-1631-738/+1420