diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/page/mac/DragControllerMac.mm | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/page/mac/DragControllerMac.mm')
| -rw-r--r-- | WebCore/page/mac/DragControllerMac.mm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/WebCore/page/mac/DragControllerMac.mm b/WebCore/page/mac/DragControllerMac.mm index 8a04809..adf89fa 100644 --- a/WebCore/page/mac/DragControllerMac.mm +++ b/WebCore/page/mac/DragControllerMac.mm @@ -42,6 +42,15 @@ const int DragController::DragIconBottomInset = 3; const float DragController::DragImageAlpha = 0.75f; +#if ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) + +DragOperation DragController::dragOperation(DragData*) +{ + return DragOperationNone; +} + +#else + bool DragController::isCopyKeyDown() { return [[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask; @@ -58,7 +67,9 @@ DragOperation DragController::dragOperation(DragData* dragData) return DragOperationCopy; return DragOperationNone; -} +} + +#endif const IntSize& DragController::maxDragImageSize() { |