Changeset 128040 in webkit

Timestamp:

Sep 10, 2012 3:55:13 AM (12 years ago)

Author:

allan.jensen@nokia.com

Message:

[Qt][WK2] REGRESSION(r127861): It made one test fail and one test crash
​https://bugs.webkit.org/show_bug.cgi?id=96243

Reviewed by Kenneth Rohde Christiansen.

Skip the code if QClipboard is not available, and give WebCore a chance to handle the event first.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::handleMouseEvent):

• WebProcess/WebPage/qt/WebPageQt.cpp:

(WebKit::WebPage::handleMouseReleaseEvent):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/qt/WebPageQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-10  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt][WK2] REGRESSION(r127861): It made one test fail and one test crash
+        https://bugs.webkit.org/show_bug.cgi?id=96243
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Skip the code if QClipboard is not available, and give WebCore a chance to handle the event first.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::handleMouseEvent):
+        * WebProcess/WebPage/qt/WebPageQt.cpp:
+        (WebKit::WebPage::handleMouseReleaseEvent):
+
 2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1352 +1352 @@
             return handled;
         }
-        case PlatformEvent::MouseReleased:
+        case PlatformEvent::MouseReleased: {
+            bool handled = frame->eventHandler()->handleMouseReleaseEvent(platformMouseEvent);
 #if PLATFORM(QT)
-            if (page->handleMouseReleaseEvent(platformMouseEvent))
-                return true;
-#endif
-            return frame->eventHandler()->handleMouseReleaseEvent(platformMouseEvent);
+            if (!handled)
+                handled = page->handleMouseReleaseEvent(platformMouseEvent);
+#endif
+            return handled;
+        }
         case PlatformEvent::MouseMoved:
             if (onlyUpdateScrollbars)

trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

@@ -443 +443 @@
 bool WebPage::handleMouseReleaseEvent(const PlatformMouseEvent& platformMouseEvent)
 {
+#ifndef QT_NO_CLIPBOARD
     if (platformMouseEvent.button() != WebCore::MiddleButton)
         return false;
@@ -453 +454 @@
         }
     }
+#endif
     return false;
 }