diff options
author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/page/win | |
parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
download | external_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/win')
-rw-r--r-- | Source/WebCore/page/win/DragControllerWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/page/win/DragControllerWin.cpp b/Source/WebCore/page/win/DragControllerWin.cpp index f0404ff..6b1cd3e 100644 --- a/Source/WebCore/page/win/DragControllerWin.cpp +++ b/Source/WebCore/page/win/DragControllerWin.cpp @@ -47,10 +47,10 @@ DragOperation DragController::dragOperation(DragData* dragData) //If this can be determined from within WebCore operationForDrag can be pulled into //WebCore itself ASSERT(dragData); - return dragData->containsURL() && !m_didInitiateDrag ? DragOperationCopy : DragOperationNone; + return dragData->containsURL(0) && !m_didInitiateDrag ? DragOperationCopy : DragOperationNone; } -bool DragController::isCopyKeyDown() +bool DragController::isCopyKeyDown(DragData*) { return ::GetAsyncKeyState(VK_CONTROL); } |