Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | am 9c0e7d80: Merge "Fix WebViewCore::createBaseLayer() to always do a layout ... | Steve Block | 2011-11-29 | 1 | -8/+6 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge "Fix WebViewCore::createBaseLayer() to always do a layout and paint the... | Steve Block | 2011-11-29 | 1 | -8/+6 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | Fix WebViewCore::createBaseLayer() to always do a layout and paint the backgr... | Steve Block | 2011-11-24 | 1 | -8/+6 | |
* | | | | | | | | am 64797036: Merge "Put canvas on a layer" into ics-mr1 | John Reck | 2011-11-28 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Put canvas on a layer" into ics-mr1 | John Reck | 2011-11-28 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | Put canvas on a layer | John Reck | 2011-11-28 | 2 | -1/+7 | |
* | | | | | | | | am 7bfb8097: Merge "Display media layers even if we ran out of layers texture... | Nicolas Roard | 2011-11-28 | 3 | -6/+10 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Merge "Display media layers even if we ran out of layers textures" into ics-mr1 | Nicolas Roard | 2011-11-28 | 3 | -6/+10 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Display media layers even if we ran out of layers textures | Nicolas Roard | 2011-11-23 | 3 | -6/+10 | |
| | |/ / / / | ||||||
* | | | | | | am 7839f0a8: Fix SVG text rendering | Steve Block | 2011-11-24 | 2 | -4/+25 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Fix SVG text rendering | Steve Block | 2011-11-24 | 2 | -4/+25 | |
| |/ / / / | ||||||
* | | | | | Only log from notImplemented() in debug builds | Steve Block | 2011-11-24 | 4 | -15/+4 | |
* | | | | | Merge "Defer CookieManager initialization." | Selim Gurun | 2011-11-23 | 2 | -14/+38 | |
|\ \ \ \ \ | ||||||
| * | | | | | Defer CookieManager initialization. | Selim Gurun | 2011-11-23 | 2 | -14/+38 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | am 3eaf0f8c: Force layers above overscroll/fixed elements to composite | Chris Craik | 2011-11-23 | 1 | -8/+0 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Force layers above overscroll/fixed elements to composite | Chris Craik | 2011-11-22 | 1 | -8/+0 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge "Move Android specific code inside the ANDROID_META_SUPPORT ifdef." | Mangesh Ghiware | 2011-11-23 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Move Android specific code inside the ANDROID_META_SUPPORT ifdef. | Mangesh Ghiware | 2011-11-22 | 1 | -1/+1 | |
* | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-22 | 0 | -0/+0 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-22 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge "Fix for bug 5152544, reduce warnings in external/webkit" | Kristian Monsen | 2011-11-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix for bug 5152544, reduce warnings in external/webkit | Kristian Monsen | 2011-11-22 | 1 | -1/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | am bd996ca3: Merge "Use isHighEndGfx to double textures" into ics-mr1 | John Reck | 2011-11-21 | 4 | -6/+14 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Merge "Use isHighEndGfx to double textures" into ics-mr1 | John Reck | 2011-11-21 | 4 | -6/+14 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Use isHighEndGfx to double textures | John Reck | 2011-11-21 | 4 | -6/+14 | |
| | | |/ / / | | |/| | | | ||||||
* | | | | | | Fix JavaBridge to handle overflow of array length | Steve Block | 2011-11-21 | 1 | -5/+10 | |
* | | | | | | am 67e60576: Merge "Set the number of current textures depending on the layer... | Nicolas Roard | 2011-11-21 | 5 | -17/+79 | |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | ||||||
| * | | | | Merge "Set the number of current textures depending on the layers' count, to ... | Nicolas Roard | 2011-11-21 | 5 | -17/+79 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Set the number of current textures depending on the layers' count, | Nicolas Roard | 2011-11-18 | 5 | -17/+79 | |
* | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-18 | 0 | -0/+0 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-17 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-16 | 0 | -0/+0 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-15 | 0 | -0/+0 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Use a single shared bitmap instead of one per BaseTile. | Nicolas Roard | 2011-11-14 | 2 | -10/+15 | |
| | | | * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-13 | 0 | -0/+0 | |
| | | | |\ \ \ \ | ||||||
* | | | | \ \ \ \ | am 59b140f3: Merge "Content and viewport rects set in one step." into ics-mr1 | Bart Sears | 2011-11-18 | 1 | -88/+71 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge "Content and viewport rects set in one step." into ics-mr1 | Bart Sears | 2011-11-18 | 1 | -88/+71 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Content and viewport rects set in one step. | George Mount | 2011-11-16 | 1 | -88/+71 | |
* | | | | | | | | | | am e2e7333b: Merge "Only allow stacking contexts to skip compositing" into ic... | Bart Sears | 2011-11-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge "Only allow stacking contexts to skip compositing" into ics-mr1 | Bart Sears | 2011-11-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Only allow stacking contexts to skip compositing | Chris Craik | 2011-11-17 | 1 | -1/+1 | |
| | | |/ / / / / / | | |/| | | | | | | ||||||
* | | | | | | | | | am 4b6100af: Merge "Force tiles to swap whenever drawing tree is ready" into ... | Chris Craik | 2011-11-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Force tiles to swap whenever drawing tree is ready" into ics-mr1 | Chris Craik | 2011-11-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Force tiles to swap whenever drawing tree is ready | Chris Craik | 2011-11-16 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | am 7fd7178c: Merge "Add logging to help debug an ANR" into ics-mr1 | Teng-Hui Zhu | 2011-11-17 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "Add logging to help debug an ANR" into ics-mr1 | Teng-Hui Zhu | 2011-11-17 | 1 | -4/+10 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Add logging to help debug an ANR | Teng-Hui Zhu | 2011-11-16 | 1 | -4/+10 | |
| | | |/ / / / / | | |/| | | | | | ||||||
* | | | | | | | | resolved conflicts for merge of 4eaaa2a0 | Chris Craik | 2011-11-17 | 31 | -738/+1420 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "synchronous layer updates, and animation deferral during paint" into i... | Chris Craik | 2011-11-16 | 31 | -738/+1420 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | synchronous layer updates, and animation deferral during paint | Chris Craik | 2011-11-16 | 31 | -738/+1420 |