diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 10:30:23 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 15:44:43 +0100 |
| commit | 9b7dff6392d373720c2140e4663e4a6b4b036bdc (patch) | |
| tree | 0e9aab49577e787e6965c6cf91694999b514afa2 /Source | |
| parent | 8c1b7730ddeb8d594bbbad19502ddb511d518ae4 (diff) | |
| download | external_webkit-9b7dff6392d373720c2140e4663e4a6b4b036bdc.zip external_webkit-9b7dff6392d373720c2140e4663e4a6b4b036bdc.tar.gz external_webkit-9b7dff6392d373720c2140e4663e4a6b4b036bdc.tar.bz2 | |
Merge WebKit at r75993: Fix DragControllerAndroid.cpp
DragData::containsURL now takes a Frame* parameter.
See http://trac.webkit.org/changeset/75523
Change-Id: Ic32fc5857389dd87eec055dbdd7a361ab6d4dba7
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/page/android/DragControllerAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/page/android/DragControllerAndroid.cpp b/Source/WebCore/page/android/DragControllerAndroid.cpp index e67daaf..b14333b 100644 --- a/Source/WebCore/page/android/DragControllerAndroid.cpp +++ b/Source/WebCore/page/android/DragControllerAndroid.cpp @@ -41,7 +41,7 @@ DragOperation DragController::dragOperation(DragData* dragData) { // FIXME: This logic is incomplete notImplemented(); - if (dragData->containsURL()) + if (dragData->containsURL(0)) return DragOperationCopy; return DragOperationNone; |