summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 891974e8: (-s ours) am 19d88459: am f18b71fe: Merge "Fix for bug 4144936: ...Kristian Monsen2011-05-240-0/+0
|\
| * am 19d88459: am f18b71fe: Merge "Fix for bug 4144936: [Proxy setting]: traffi...Kristian Monsen2011-05-241-5/+6
| |\
| | * am f18b71fe: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass...Kristian Monsen2011-05-241-5/+6
| | |\
| | | * Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn...Kristian Monsen2011-05-241-5/+6
| | | |\
| | | | * Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypa...Kristian Monsen2011-05-241-5/+6
* | | | | Merge "Don't change website's content width."Shimeng (Simon) Wang2011-05-241-4/+0
|\ \ \ \ \
| * | | | | Don't change website's content width.Shimeng (Simon) Wang2011-05-241-4/+0
* | | | | | am 2f7dd354: (-s ours) am 49fd7191: am e17c8aee: DO NOT MERGE: The clip shoul...Teng-Hui Zhu2011-05-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 49fd7191: am e17c8aee: DO NOT MERGE: The clip should be effective even if ...Teng-Hui Zhu2011-05-231-3/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.Teng-Hui Zhu2011-05-231-3/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | DO NOT MERGE: The clip should be effective even if it is empty.Teng-Hui Zhu2011-05-231-3/+0
* | | | | | Merge "In DRT2, correctly handle a non-existent path"Steve Block2011-05-241-6/+8
|\ \ \ \ \ \
| * | | | | | In DRT2, correctly handle a non-existent pathSteve Block2011-05-241-6/+8
* | | | | | | Merge "Use the correct type for the new quota for HTML5 Database and AppCache"Steve Block2011-05-242-15/+17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use the correct type for the new quota for HTML5 Database and AppCacheSteve Block2011-05-242-15/+17
| |/ / / / /
* | | | | | Merge "Check that the view is not null in GraphicsLayerAndroid::updateFixedPo...Steve Block2011-05-241-1/+4
|\ \ \ \ \ \
| * | | | | | Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()Steve Block2011-05-241-1/+4
| |/ / / / /
* | | | | | am 712ed50f: (-s ours) am f69d55a8: am 635861a9: DO NOT MERGE:Fix position up...Teng-Hui Zhu2011-05-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am f69d55a8: am 635861a9: DO NOT MERGE:Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 635861a9: DO NOT MERGE:Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | DO NOT MERGE:Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| | | | |/ | | | |/|
* | | | | Merge "Add LayoutTests/fast/dom/HTMLLinkElement at r76408"Steve Block2011-05-2415-0/+202
|\ \ \ \ \
| * | | | | Add LayoutTests/fast/dom/HTMLLinkElement at r76408Steve Block2011-05-2415-0/+202
| | |_|_|/ | |/| | |
* | | | | Improve the layer dump to include clipRectTeng-Hui Zhu2011-05-231-0/+1
* | | | | The clip should be effective even if it is empty.Teng-Hui Zhu2011-05-231-3/+0
|/ / / /
* | | | Merge WebKit at r76408: Update ThirdPartyProject.propBen Murdoch2011-05-231-2/+2
* | | | Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-2341-42/+42
* | | | Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-233-5/+5
* | | | Merge WebKit at r76408: Fix EventHandlerAndroid.cppBen Murdoch2011-05-231-3/+0
* | | | Merge WebKit at r76408: Fix FontAndroid.cppBen Murdoch2011-05-231-0/+1
* | | | Merge WebKit at r76408: Rename syncCompositingStateRecursive()Ben Murdoch2011-05-231-1/+1
* | | | Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBaseBen Murdoch2011-05-237-5/+14
* | | | Merge WebKit at r76408: Fix ImageBufferAndroid.Ben Murdoch2011-05-231-0/+5
* | | | Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-2313-239/+159
* | | | Merge WebKit at r76408: Fix Makefiles.Ben Murdoch2011-05-234-2/+4
* | | | Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231355-13430/+56258
* | | | Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| | | |
| \ \ \
*-. \ \ \ Reconcile with honeycomb-release honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \
| | * \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | |\ \ \ \ | | | |/ / / / /
| | | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | |\ \ \ \ | | | |/ / / / /
| | | | * | | | merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-150-0/+0
| | | | | |\ \ \ \ | | | | |/ / / / /