Title: [128040] trunk/Source/WebKit2
- Revision
- 128040
- Author
- [email protected]
- Date
- 2012-09-10 03:55:13 -0700 (Mon, 10 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128039 => 128040)
--- trunk/Source/WebKit2/ChangeLog 2012-09-10 10:30:32 UTC (rev 128039)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-10 10:55:13 UTC (rev 128040)
@@ -1,3 +1,17 @@
+2012-09-10 Allan Sandfeld Jensen <[email protected]>
+
+ [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 <[email protected]>
[Qt] WK2 build fixes for MSVC
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (128039 => 128040)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-09-10 10:30:32 UTC (rev 128039)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-09-10 10:55:13 UTC (rev 128040)
@@ -1351,12 +1351,14 @@
return handled;
}
- case PlatformEvent::MouseReleased:
+ case PlatformEvent::MouseReleased: {
+ bool handled = frame->eventHandler()->handleMouseReleaseEvent(platformMouseEvent);
#if PLATFORM(QT)
- if (page->handleMouseReleaseEvent(platformMouseEvent))
- return true;
+ if (!handled)
+ handled = page->handleMouseReleaseEvent(platformMouseEvent);
#endif
- return frame->eventHandler()->handleMouseReleaseEvent(platformMouseEvent);
+ return handled;
+ }
case PlatformEvent::MouseMoved:
if (onlyUpdateScrollbars)
return frame->eventHandler()->passMouseMovedEventToScrollbars(platformMouseEvent);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp (128039 => 128040)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2012-09-10 10:30:32 UTC (rev 128039)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2012-09-10 10:55:13 UTC (rev 128040)
@@ -442,6 +442,7 @@
bool WebPage::handleMouseReleaseEvent(const PlatformMouseEvent& platformMouseEvent)
{
+#ifndef QT_NO_CLIPBOARD
if (platformMouseEvent.button() != WebCore::MiddleButton)
return false;
@@ -452,6 +453,7 @@
return true;
}
}
+#endif
return false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
