- Revision
- 221260
- Author
- [email protected]
- Date
- 2017-08-28 09:37:31 -0700 (Mon, 28 Aug 2017)
Log Message
[GTK] [WPE] Rename EventHandlerGlib to EventHandlerGLib
https://bugs.webkit.org/show_bug.cgi?id=175864
Unreviewed cosmetic follow-up patch after r221075.
No new tests. No change in behavior.
* PlatformGTK.cmake:
* PlatformWPE.cmake:
* platform/glib/EventHandlerGLib.cpp: Renamed from Source/WebCore/platform/glib/EventHandlerGlib.cpp.
(WebCore::EventHandler::tabsToAllFormControls const):
(WebCore::EventHandler::focusDocumentView):
(WebCore::EventHandler::passWidgetMouseDownEventToWidget):
(WebCore::EventHandler::passMouseDownEventToWidget):
(WebCore::EventHandler::eventActivatedView const):
(WebCore::EventHandler::widgetDidHandleWheelEvent):
(WebCore::EventHandler::createDraggingDataTransfer const):
(WebCore::EventHandler::passMousePressEventToSubframe):
(WebCore::EventHandler::passMouseMoveEventToSubframe):
(WebCore::EventHandler::passMouseReleaseEventToSubframe):
(WebCore::EventHandler::accessKeyModifiers):
(WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal const):
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (221259 => 221260)
--- trunk/Source/WebCore/ChangeLog 2017-08-28 15:54:35 UTC (rev 221259)
+++ trunk/Source/WebCore/ChangeLog 2017-08-28 16:37:31 UTC (rev 221260)
@@ -1,3 +1,28 @@
+2017-08-28 Carlos Alberto Lopez Perez <[email protected]>
+
+ [GTK] [WPE] Rename EventHandlerGlib to EventHandlerGLib
+ https://bugs.webkit.org/show_bug.cgi?id=175864
+
+ Unreviewed cosmetic follow-up patch after r221075.
+
+ No new tests. No change in behavior.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * platform/glib/EventHandlerGLib.cpp: Renamed from Source/WebCore/platform/glib/EventHandlerGlib.cpp.
+ (WebCore::EventHandler::tabsToAllFormControls const):
+ (WebCore::EventHandler::focusDocumentView):
+ (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
+ (WebCore::EventHandler::passMouseDownEventToWidget):
+ (WebCore::EventHandler::eventActivatedView const):
+ (WebCore::EventHandler::widgetDidHandleWheelEvent):
+ (WebCore::EventHandler::createDraggingDataTransfer const):
+ (WebCore::EventHandler::passMousePressEventToSubframe):
+ (WebCore::EventHandler::passMouseMoveEventToSubframe):
+ (WebCore::EventHandler::passMouseReleaseEventToSubframe):
+ (WebCore::EventHandler::accessKeyModifiers):
+ (WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal const):
+
2017-08-28 Zan Dobersek <[email protected]>
[WebCrypto] Push WorkQueue dispatches for AES algorithms into shared code
Modified: trunk/Source/WebCore/PlatformGTK.cmake (221259 => 221260)
--- trunk/Source/WebCore/PlatformGTK.cmake 2017-08-28 15:54:35 UTC (rev 221259)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-08-28 16:37:31 UTC (rev 221260)
@@ -146,7 +146,7 @@
page/gtk/DragControllerGtk.cpp
- platform/glib/EventHandlerGlib.cpp
+ platform/glib/EventHandlerGLib.cpp
platform/graphics/PlatformDisplay.cpp
Modified: trunk/Source/WebCore/PlatformWPE.cmake (221259 => 221260)
--- trunk/Source/WebCore/PlatformWPE.cmake 2017-08-28 15:54:35 UTC (rev 221259)
+++ trunk/Source/WebCore/PlatformWPE.cmake 2017-08-28 16:37:31 UTC (rev 221260)
@@ -132,7 +132,7 @@
list(APPEND WebCorePlatformWPE_SOURCES
editing/wpe/EditorWPE.cpp
- platform/glib/EventHandlerGlib.cpp
+ platform/glib/EventHandlerGLib.cpp
platform/graphics/egl/GLContextEGLWPE.cpp
Copied: trunk/Source/WebCore/platform/glib/EventHandlerGLib.cpp (from rev 221258, trunk/Source/WebCore/platform/glib/EventHandlerGlib.cpp) (0 => 221260)
--- trunk/Source/WebCore/platform/glib/EventHandlerGLib.cpp (rev 0)
+++ trunk/Source/WebCore/platform/glib/EventHandlerGLib.cpp 2017-08-28 16:37:31 UTC (rev 221260)
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2006 Zack Rusin <[email protected]>
+ * Copyright (C) 2014-2017 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * 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 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 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
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "EventHandler.h"
+
+#include "FocusController.h"
+#include "Frame.h"
+#include "FrameView.h"
+#include "KeyboardEvent.h"
+#include "MouseEventWithHitTestResults.h"
+#include "NotImplemented.h"
+#include "Page.h"
+#include "PlatformKeyboardEvent.h"
+#include "PlatformWheelEvent.h"
+#include "RenderWidget.h"
+
+#if ENABLE(DRAG_SUPPORT)
+#include "DataTransfer.h"
+#endif
+
+#if PLATFORM(GTK)
+#include "Scrollbar.h"
+#endif
+
+namespace WebCore {
+
+#if ENABLE(DRAG_SUPPORT)
+const double EventHandler::TextDragDelay = 0.0;
+#endif
+
+bool EventHandler::tabsToAllFormControls(KeyboardEvent&) const
+{
+ // We always allow tabs to all controls
+ return true;
+}
+
+void EventHandler::focusDocumentView()
+{
+ if (Page* page = m_frame.page())
+ page->focusController().setFocusedFrame(&m_frame);
+}
+
+bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event)
+{
+ // Figure out which view to send the event to.
+ RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : nullptr;
+ if (!is<RenderWidget>(target))
+ return false;
+ return passMouseDownEventToWidget(downcast<RenderWidget>(*target).widget());
+}
+
+bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
+{
+ return passMouseDownEventToWidget(renderWidget->widget());
+}
+
+bool EventHandler::passMouseDownEventToWidget(Widget*)
+{
+ notImplemented();
+ return false;
+}
+
+bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
+{
+ // GTK+ activation is not necessarily tied to mouse events, so it may
+ // not make sense to implement this
+
+ notImplemented();
+ return false;
+}
+
+bool EventHandler::widgetDidHandleWheelEvent(const PlatformWheelEvent& event, Widget& widget)
+{
+ if (!is<FrameView>(widget))
+ return false;
+
+ return downcast<FrameView>(widget).frame().eventHandler().handleWheelEvent(event);
+}
+
+#if ENABLE(DRAG_SUPPORT)
+
+Ref<DataTransfer> EventHandler::createDraggingDataTransfer() const
+{
+ return DataTransfer::createForDrag();
+}
+
+#endif
+
+bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
+{
+ subframe->eventHandler().handleMousePressEvent(mev.event());
+ return true;
+}
+
+bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe, HitTestResult* hoveredNode)
+{
+ subframe->eventHandler().handleMouseMoveEvent(mev.event(), hoveredNode);
+ return true;
+}
+
+bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
+{
+ subframe->eventHandler().handleMouseReleaseEvent(mev.event());
+ return true;
+}
+
+OptionSet<PlatformEvent::Modifier> EventHandler::accessKeyModifiers()
+{
+ 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& event) const
+{
+#if PLATFORM(GTK)
+ FrameView* view = m_frame.view();
+ Scrollbar* scrollbar = view ? view->scrollbarAtPoint(event.position()) : nullptr;
+ if (!scrollbar)
+ scrollbar = result.scrollbar();
+ return scrollbar && scrollbar->orientation() == HorizontalScrollbar;
+#else
+ UNUSED_PARAM(result);
+ UNUSED_PARAM(event);
+ notImplemented();
+ return false;
+#endif
+}
+
+}
Deleted: trunk/Source/WebCore/platform/glib/EventHandlerGlib.cpp (221259 => 221260)
--- trunk/Source/WebCore/platform/glib/EventHandlerGlib.cpp 2017-08-28 15:54:35 UTC (rev 221259)
+++ trunk/Source/WebCore/platform/glib/EventHandlerGlib.cpp 2017-08-28 16:37:31 UTC (rev 221260)
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2006 Zack Rusin <[email protected]>
- * Copyright (C) 2014-2017 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * 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 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 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
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "EventHandler.h"
-
-#include "FocusController.h"
-#include "Frame.h"
-#include "FrameView.h"
-#include "KeyboardEvent.h"
-#include "MouseEventWithHitTestResults.h"
-#include "NotImplemented.h"
-#include "Page.h"
-#include "PlatformKeyboardEvent.h"
-#include "PlatformWheelEvent.h"
-#include "RenderWidget.h"
-
-#if ENABLE(DRAG_SUPPORT)
-#include "DataTransfer.h"
-#endif
-
-#if PLATFORM(GTK)
-#include "Scrollbar.h"
-#endif
-
-namespace WebCore {
-
-#if ENABLE(DRAG_SUPPORT)
-const double EventHandler::TextDragDelay = 0.0;
-#endif
-
-bool EventHandler::tabsToAllFormControls(KeyboardEvent&) const
-{
- // We always allow tabs to all controls
- return true;
-}
-
-void EventHandler::focusDocumentView()
-{
- if (Page* page = m_frame.page())
- page->focusController().setFocusedFrame(&m_frame);
-}
-
-bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event)
-{
- // Figure out which view to send the event to.
- RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : nullptr;
- if (!is<RenderWidget>(target))
- return false;
- return passMouseDownEventToWidget(downcast<RenderWidget>(*target).widget());
-}
-
-bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
-{
- return passMouseDownEventToWidget(renderWidget->widget());
-}
-
-bool EventHandler::passMouseDownEventToWidget(Widget*)
-{
- notImplemented();
- return false;
-}
-
-bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
-{
- // GTK+ activation is not necessarily tied to mouse events, so it may
- // not make sense to implement this
-
- notImplemented();
- return false;
-}
-
-bool EventHandler::widgetDidHandleWheelEvent(const PlatformWheelEvent& event, Widget& widget)
-{
- if (!is<FrameView>(widget))
- return false;
-
- return downcast<FrameView>(widget).frame().eventHandler().handleWheelEvent(event);
-}
-
-#if ENABLE(DRAG_SUPPORT)
-
-Ref<DataTransfer> EventHandler::createDraggingDataTransfer() const
-{
- return DataTransfer::createForDrag();
-}
-
-#endif
-
-bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
-{
- subframe->eventHandler().handleMousePressEvent(mev.event());
- return true;
-}
-
-bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe, HitTestResult* hoveredNode)
-{
- subframe->eventHandler().handleMouseMoveEvent(mev.event(), hoveredNode);
- return true;
-}
-
-bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
-{
- subframe->eventHandler().handleMouseReleaseEvent(mev.event());
- return true;
-}
-
-OptionSet<PlatformEvent::Modifier> EventHandler::accessKeyModifiers()
-{
- 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& event) const
-{
-#if PLATFORM(GTK)
- FrameView* view = m_frame.view();
- Scrollbar* scrollbar = view ? view->scrollbarAtPoint(event.position()) : nullptr;
- if (!scrollbar)
- scrollbar = result.scrollbar();
- return scrollbar && scrollbar->orientation() == HorizontalScrollbar;
-#else
- UNUSED_PARAM(result);
- UNUSED_PARAM(event);
- notImplemented();
- return false;
-#endif
-}
-
-}
