diff options
| author | Steve Block <steveblock@google.com> | 2011-05-09 17:47:02 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-13 11:32:28 +0100 |
| commit | 5b8c725c6846b6f59ba9a5e6f562774f74046622 (patch) | |
| tree | 9fbbe94d1093de8e37a04556d34cc6fe97be4c84 /Source/WebCore/page/DOMWindow.cpp | |
| parent | 0fa866435a202d26c06a48475da734e9e98c2879 (diff) | |
| download | external_webkit-5b8c725c6846b6f59ba9a5e6f562774f74046622.zip external_webkit-5b8c725c6846b6f59ba9a5e6f562774f74046622.tar.gz external_webkit-5b8c725c6846b6f59ba9a5e6f562774f74046622.tar.bz2 | |
Merge WebKit at r75315: Fix conflicts
- HTMLInputElement.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
See http://trac.webkit.org/changeset/74895
- HTMLInputElement.cpp and RangeInputType.cpp
Conflict due to refactoring of event handling on input elements
See http://trac.webkit.org/changeset/74549
- DOMWindow.cpp
Conflict due to DOMWindow::clearDOMStorage()
See http://trac.webkit.org/changeset/74800
- EventHandler.cpp
Conflict due to longpress and doubletap vs touch event refactoring
See http://trac.webkit.org/changeset/74553
- History.cpp
Trivial conflict due to cherry-pick
See http://trac.webkit.org/changeset/74853
- GraphicsContext.cpp
Conflict due to PLATFORM(ANDROID) guard
See http://trac.webkit.org/changeset/74662
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/74971
Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
Diffstat (limited to 'Source/WebCore/page/DOMWindow.cpp')
| -rw-r--r-- | Source/WebCore/page/DOMWindow.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp index c2e8c39..be6c179 100644 --- a/Source/WebCore/page/DOMWindow.cpp +++ b/Source/WebCore/page/DOMWindow.cpp @@ -1634,7 +1634,6 @@ void DOMWindow::revokeObjectURL(const String& blobURLString) } #endif -<<<<<<< HEAD:WebCore/page/DOMWindow.cpp #if ENABLE(DOM_STORAGE) && defined(ANDROID) void DOMWindow::clearDOMStorage() { @@ -1648,10 +1647,7 @@ void DOMWindow::clearDOMStorage() } #endif -void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow) -======= void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow, SetLocationLocking locking) ->>>>>>> webkit.org at r75315:Source/WebCore/page/DOMWindow.cpp { Frame* activeFrame = activeWindow->frame(); if (!activeFrame) |