Attachment 354506 Details for Bug 191481 – WIP patch

[patch] WIP patch

bug-191481-20181111105015.patch (text/plain), 2.90 KB, created by Michael Catanzaro on 2018-11-11 08:50:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-11-11 08:50:16 PST

Size: 2.90 KB

patch

obsolete

>Subversion Revision: 238069
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ce4d9a181746e5fab215db57a74429e52ada0772..9ccb8cba9324085d1727fbca6589e396710f48ac 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-11-11  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        REGRESSION(r223264): [GTK] Unable to drag documents on Google Drive
>+        https://bugs.webkit.org/show_bug.cgi?id=191481
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (OOPS!).
>+
>+        * platform/gtk/PlatformMouseEventGtk.cpp:
>+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
>+
> 2018-11-10  Tim Horton  <timothy_horton@apple.com>
> 
>         Make it possible to edit images inline
>diff --git a/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
>index 9337f81a35c4c4e26dd1728bc9951a92fe4ccc5a..e61fdc119c6158e17389b8a2281777dffdf5daaf 100644
>--- a/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
>+++ b/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
>@@ -43,6 +43,7 @@ PlatformMouseEvent::PlatformMouseEvent(GdkEventButton* event)
>     m_position = IntPoint((int)event->x, (int)event->y);
>     m_globalPosition = IntPoint((int)event->x_root, (int)event->y_root);
>     m_button = NoButton;
>+    m_buttons = 0;
>     m_clickCount = 0;
>     m_modifierFlags = 0;
> 
>@@ -57,6 +58,13 @@ PlatformMouseEvent::PlatformMouseEvent(GdkEventButton* event)
>     if (PlatformKeyboardEvent::modifiersContainCapsLock(event->state))
>         m_modifiers.add(PlatformEvent::Modifier::CapsLockKey);
> 
>+    if (event->state & GDK_BUTTON1_MASK)
>+        m_buttons |= LeftButton;
>+    if (event->state & GDK_BUTTON2_MASK)
>+        m_buttons |= MiddleButton;
>+    if (event->state & GDK_BUTTON3_MASK)
>+        m_buttons |= RightButton;
>+
>     switch (event->type) {
>     case GDK_BUTTON_PRESS:
>     case GDK_2BUTTON_PRESS:
>@@ -92,6 +100,7 @@ PlatformMouseEvent::PlatformMouseEvent(GdkEventMotion* motion)
>     m_position = IntPoint((int)motion->x, (int)motion->y);
>     m_globalPosition = IntPoint((int)motion->x_root, (int)motion->y_root);
>     m_button = NoButton;
>+    m_buttons = 0;
>     m_clickCount = 0;
>     m_modifierFlags = 0;
> 
>@@ -116,11 +125,18 @@ PlatformMouseEvent::PlatformMouseEvent(GdkEventMotion* motion)
>         ASSERT_NOT_REACHED();
>     };
> 
>-    if (motion->state & GDK_BUTTON1_MASK)
>-        m_button = LeftButton;
>-    else if (motion->state & GDK_BUTTON2_MASK)
>-        m_button = MiddleButton;
>-    else if (motion->state & GDK_BUTTON3_MASK)
>+    if (motion->state & GDK_BUTTON3_MASK) {
>         m_button = RightButton;
>+        m_buttons |= RightButton;
>+    }
>+    if (motion->state & GDK_BUTTON2_MASK) {
>+        m_button = MiddleButton;
>+        m_buttons |= MiddleButton;
>+    }
>+    if (motion->state & GDK_BUTTON1_MASK) {
>+        m_button = LeftButton;
>+        m_buttons |= LeftButton;
>+    }
> }
>-}
>+
>+} // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 191481: 354506