Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn... | Kristian Monsen | 2011-05-24 | 1 | -5/+6 | |
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | | * | | | | Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypa... | Kristian Monsen | 2011-05-24 | 1 | -5/+6 | |
* | | | | | | | | Merge "Don't change website's content width." | Shimeng (Simon) Wang | 2011-05-24 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Don't change website's content width. | Shimeng (Simon) Wang | 2011-05-24 | 1 | -4/+0 | |
* | | | | | | | | am 2f7dd354: (-s ours) am 49fd7191: am e17c8aee: DO NOT MERGE: The clip shoul... | Teng-Hui Zhu | 2011-05-24 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | am 49fd7191: am e17c8aee: DO NOT MERGE: The clip should be effective even if ... | Teng-Hui Zhu | 2011-05-23 | 1 | -3/+0 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | am e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty. | Teng-Hui Zhu | 2011-05-23 | 1 | -3/+0 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | | * | | | | | DO NOT MERGE: The clip should be effective even if it is empty. | Teng-Hui Zhu | 2011-05-23 | 1 | -3/+0 | |
* | | | | | | | | Merge "In DRT2, correctly handle a non-existent path" | Steve Block | 2011-05-24 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | In DRT2, correctly handle a non-existent path | Steve Block | 2011-05-24 | 1 | -6/+8 | |
* | | | | | | | | | Merge "Use the correct type for the new quota for HTML5 Database and AppCache" | Steve Block | 2011-05-24 | 2 | -15/+17 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use the correct type for the new quota for HTML5 Database and AppCache | Steve Block | 2011-05-24 | 2 | -15/+17 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "Check that the view is not null in GraphicsLayerAndroid::updateFixedPo... | Steve Block | 2011-05-24 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition() | Steve Block | 2011-05-24 | 1 | -1/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | am 712ed50f: (-s ours) am f69d55a8: am 635861a9: DO NOT MERGE:Fix position up... | Teng-Hui Zhu | 2011-05-24 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | am f69d55a8: am 635861a9: DO NOT MERGE:Fix position update | Teng-Hui Zhu | 2011-05-23 | 2 | -18/+15 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | am 635861a9: DO NOT MERGE:Fix position update | Teng-Hui Zhu | 2011-05-23 | 2 | -18/+15 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | | * | | | | DO NOT MERGE:Fix position update | Teng-Hui Zhu | 2011-05-23 | 2 | -18/+15 | |
| | | | |/ / | | | |/| | | ||||||
* | | | | | | Merge "Add LayoutTests/fast/dom/HTMLLinkElement at r76408" | Steve Block | 2011-05-24 | 15 | -0/+202 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add LayoutTests/fast/dom/HTMLLinkElement at r76408 | Steve Block | 2011-05-24 | 15 | -0/+202 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Improve the layer dump to include clipRect | Teng-Hui Zhu | 2011-05-23 | 1 | -0/+1 | |
* | | | | | | The clip should be effective even if it is empty. | Teng-Hui Zhu | 2011-05-23 | 1 | -3/+0 | |
|/ / / / / | ||||||
* | | | | | Merge WebKit at r76408: Update ThirdPartyProject.prop | Ben Murdoch | 2011-05-23 | 1 | -2/+2 | |
* | | | | | Merge WebKit at r76408: Fix Bridge.h | Ben Murdoch | 2011-05-23 | 41 | -42/+42 | |
* | | | | | Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset() | Ben Murdoch | 2011-05-23 | 3 | -5/+5 | |
* | | | | | Merge WebKit at r76408: Fix EventHandlerAndroid.cpp | Ben Murdoch | 2011-05-23 | 1 | -3/+0 | |
* | | | | | Merge WebKit at r76408: Fix FontAndroid.cpp | Ben Murdoch | 2011-05-23 | 1 | -0/+1 | |
* | | | | | Merge WebKit at r76408: Rename syncCompositingStateRecursive() | Ben Murdoch | 2011-05-23 | 1 | -1/+1 | |
* | | | | | Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBase | Ben Murdoch | 2011-05-23 | 7 | -5/+14 | |
* | | | | | Merge WebKit at r76408: Fix ImageBufferAndroid. | Ben Murdoch | 2011-05-23 | 1 | -0/+5 | |
* | | | | | Merge WebKit at r76408: Fix conflicts. | Ben Murdoch | 2011-05-23 | 13 | -239/+159 | |
* | | | | | Merge WebKit at r76408: Fix Makefiles. | Ben Murdoch | 2011-05-23 | 4 | -2/+4 | |
* | | | | | Merge WebKit at r76408: Initial merge by git. | Ben Murdoch | 2011-05-23 | 1355 | -13430/+56258 | |
* | | | | | Fix position update | Teng-Hui Zhu | 2011-05-23 | 2 | -18/+15 | |
| |_|_|/ |/| | | | ||||||
| | | | | ||||||
| \ \ \ | ||||||
*-. \ \ \ | Reconcile with honeycomb-release honeycomb-mr1-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 | |
|\ \ \ \ \ | ||||||
| | * \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-05 | 0 | -0/+0 | |
| | | |\ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-05 | 0 | -0/+0 | |
| | | |\ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-04 | 0 | -0/+0 | |
| | | |\ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-03 | 0 | -0/+0 | |
| | | |\ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-29 | 0 | -0/+0 | |
| | | |\ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-28 | 0 | -0/+0 | |
| | | |\ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-27 | 0 | -0/+0 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-25 | 0 | -0/+0 | |
| | | | |\ \ \ \ | | | |/ / / / / | ||||||
| | | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-21 | 0 | -0/+0 | |
| | | | |\ \ \ \ | | | |/ / / / / | ||||||
| | | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-19 | 0 | -0/+0 | |
| | | | |\ \ \ \ | ||||||
| | | | | * \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-15 | 0 | -0/+0 | |
| | | | | |\ \ \ \ | | | | |/ / / / / | ||||||
| | | | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-13 | 0 | -0/+0 | |
| | | | | |\ \ \ \ | | | | |/ / / / / | ||||||
| | | | | * | | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-07 | 0 | -0/+0 | |
| | | | | |\ \ \ \ | ||||||
| | | | | | * \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-07 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ |