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/qt | |
| 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/qt')
| -rw-r--r-- | Source/WebCore/page/qt/DragControllerQt.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/page/qt/FrameQt.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/page/qt/DragControllerQt.cpp b/Source/WebCore/page/qt/DragControllerQt.cpp index 33815b5..cdea55b 100644 --- a/Source/WebCore/page/qt/DragControllerQt.cpp +++ b/Source/WebCore/page/qt/DragControllerQt.cpp @@ -43,7 +43,7 @@ const int DragController::DragIconBottomInset = 3; const float DragController::DragImageAlpha = 0.75f; -bool DragController::isCopyKeyDown() +bool DragController::isCopyKeyDown(DragData*) { return false; } @@ -51,7 +51,7 @@ bool DragController::isCopyKeyDown() DragOperation DragController::dragOperation(DragData* dragData) { //FIXME: This logic is incomplete - if (dragData->containsURL()) + if (dragData->containsURL(0)) return DragOperationCopy; return DragOperationNone; diff --git a/Source/WebCore/page/qt/FrameQt.cpp b/Source/WebCore/page/qt/FrameQt.cpp index 467592c..bb577e0 100644 --- a/Source/WebCore/page/qt/FrameQt.cpp +++ b/Source/WebCore/page/qt/FrameQt.cpp @@ -24,6 +24,7 @@ #include "config.h" #include "Frame.h" #include "FrameView.h" +#include "GraphicsContext.h" #include "Image.h" #include "ImageBuffer.h" |