diff options
Diffstat (limited to 'Source/WebCore/page/gtk')
| -rw-r--r-- | Source/WebCore/page/gtk/DragControllerGtk.cpp | 31 | ||||
| -rw-r--r-- | Source/WebCore/page/gtk/EventHandlerGtk.cpp | 41 |
2 files changed, 43 insertions, 29 deletions
diff --git a/Source/WebCore/page/gtk/DragControllerGtk.cpp b/Source/WebCore/page/gtk/DragControllerGtk.cpp index 69606a4ba..0e605d750 100644 --- a/Source/WebCore/page/gtk/DragControllerGtk.cpp +++ b/Source/WebCore/page/gtk/DragControllerGtk.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -26,13 +26,14 @@ #include "config.h" #include "DragController.h" -#include "Clipboard.h" +#include "DataTransfer.h" +#include "Document.h" #include "DragData.h" +#include "Editor.h" #include "Element.h" #include "Frame.h" -#include "FrameView.h" -#include "Page.h" #include "Pasteboard.h" +#include "markup.h" namespace WebCore { @@ -45,15 +46,15 @@ const int DragController::DragIconBottomInset = 3; const float DragController::DragImageAlpha = 0.75f; -bool DragController::isCopyKeyDown(DragData&) +bool DragController::isCopyKeyDown(const DragData& dragData) { - return false; + return dragData.flags() & DragApplicationIsCopyKeyDown; } -DragOperation DragController::dragOperation(DragData& dragData) +DragOperation DragController::dragOperation(const DragData& dragData) { // FIXME: This logic is incomplete - if (dragData.containsURL(0)) + if (dragData.containsURL()) return DragOperationCopy; return DragOperationNone; @@ -69,9 +70,17 @@ void DragController::cleanupAfterSystemDrag() { } -void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label) +void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label) { - clipboard.pasteboard().writeImage(element, url, label); + Frame* frame = element.document().frame(); + ASSERT(frame); + frame->editor().writeImageToPasteboard(dataTransfer.pasteboard(), element, url, label); } +#if ENABLE(ATTACHMENT_ELEMENT) +void DragController::declareAndWriteAttachment(DataTransfer&, Element&, const URL&) +{ +} +#endif + } diff --git a/Source/WebCore/page/gtk/EventHandlerGtk.cpp b/Source/WebCore/page/gtk/EventHandlerGtk.cpp index e6e45625c..5f09e975c 100644 --- a/Source/WebCore/page/gtk/EventHandlerGtk.cpp +++ b/Source/WebCore/page/gtk/EventHandlerGtk.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -26,7 +26,7 @@ #include "config.h" #include "EventHandler.h" -#include "Clipboard.h" +#include "DataTransfer.h" #include "FloatPoint.h" #include "FocusController.h" #include "Frame.h" @@ -46,7 +46,7 @@ namespace WebCore { const double EventHandler::TextDragDelay = 0.0; #endif -bool EventHandler::tabsToAllFormControls(KeyboardEvent* event) const +bool EventHandler::tabsToAllFormControls(KeyboardEvent&) const { // We always allow tabs to all controls return true; @@ -61,10 +61,10 @@ void EventHandler::focusDocumentView() bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event) { // Figure out which view to send the event to. - RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0; - if (!target || !target->isWidget()) + RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : nullptr; + if (!is<RenderWidget>(target)) return false; - return passMouseDownEventToWidget(toRenderWidget(target)->widget()); + return passMouseDownEventToWidget(downcast<RenderWidget>(*target).widget()); } bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget) @@ -72,7 +72,7 @@ bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget) return passMouseDownEventToWidget(renderWidget->widget()); } -bool EventHandler::passMouseDownEventToWidget(Widget* widget) +bool EventHandler::passMouseDownEventToWidget(Widget*) { notImplemented(); return false; @@ -87,20 +87,21 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const return false; } -bool EventHandler::passWheelEventToWidget(const PlatformWheelEvent& event, Widget* widget) +bool EventHandler::widgetDidHandleWheelEvent(const PlatformWheelEvent& event, Widget& widget) { - ASSERT(widget); - if (!widget->isFrameView()) + if (!is<FrameView>(widget)) return false; - return toFrameView(widget)->frame().eventHandler().handleWheelEvent(event); + return downcast<FrameView>(widget).frame().eventHandler().handleWheelEvent(event); } #if ENABLE(DRAG_SUPPORT) -PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const + +Ref<DataTransfer> EventHandler::createDraggingDataTransfer() const { - return Clipboard::createForDragAndDrop(); + return DataTransfer::createForDrag(); } + #endif bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) @@ -121,18 +122,22 @@ bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& return true; } -unsigned EventHandler::accessKeyModifiers() +OptionSet<PlatformEvent::Modifier> EventHandler::accessKeyModifiers() { - return PlatformEvent::AltKey; + return PlatformEvent::Modifier::AltKey; } // GTK+ must scroll horizontally if the mouse pointer is on top of the // horizontal scrollbar while scrolling with the wheel; we need to // add the deltas and ticks here so that this behavior is consistent // for styled scrollbars. -bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result, const PlatformWheelEvent&) const +bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result, const PlatformWheelEvent& event) const { - return result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar; + FrameView* view = m_frame.view(); + Scrollbar* scrollbar = view ? view->scrollbarAtPoint(event.position()) : nullptr; + if (!scrollbar) + scrollbar = result.scrollbar(); + return scrollbar && scrollbar->orientation() == HorizontalScrollbar; } } |