From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 13 May 2011 16:23:25 +0100 Subject: Merge WebKit at r75993: Initial merge by git. Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3 --- 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 b20ab60..e67daaf 100644 --- a/Source/WebCore/page/android/DragControllerAndroid.cpp +++ b/Source/WebCore/page/android/DragControllerAndroid.cpp @@ -32,7 +32,7 @@ namespace WebCore { -bool DragController::isCopyKeyDown() +bool DragController::isCopyKeyDown(DragData*) { return false; } -- cgit v1.1