From 9b7dff6392d373720c2140e4663e4a6b4b036bdc Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 May 2011 10:30:23 +0100 Subject: Merge WebKit at r75993: Fix DragControllerAndroid.cpp DragData::containsURL now takes a Frame* parameter. See http://trac.webkit.org/changeset/75523 Change-Id: Ic32fc5857389dd87eec055dbdd7a361ab6d4dba7 --- Source/WebCore/page/android/DragControllerAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebCore/page/android') 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; -- cgit v1.1