summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/page/DragController.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-13 16:23:25 +0100
committerBen Murdoch <benm@google.com>2011-05-16 11:35:02 +0100
commit65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch)
treef478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/page/DragController.h
parent47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff)
downloadexternal_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/page/DragController.h')
-rw-r--r--Source/WebCore/page/DragController.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/page/DragController.h b/Source/WebCore/page/DragController.h
index 0e90a52..10bb5f8 100644
--- a/Source/WebCore/page/DragController.h
+++ b/Source/WebCore/page/DragController.h
@@ -99,8 +99,8 @@ namespace WebCore {
bool tryDHTMLDrag(DragData*, DragOperation&);
DragOperation dragOperation(DragData*);
void cancelDrag();
- bool dragIsMove(SelectionController*);
- bool isCopyKeyDown();
+ bool dragIsMove(SelectionController*, DragData*);
+ bool isCopyKeyDown(DragData*);
void mouseMovedIntoDocument(Document*);