Title: [102374] branches/safari-534.53-branch/Source/WebKit2
Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102373 => 102374)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-08 21:07:57 UTC (rev 102373)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-08 21:11:44 UTC (rev 102374)
@@ -1,5 +1,24 @@
2011-12-08 Lucas Forschler <[email protected]>
+ Merge 101719
+
+ 2011-12-01 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=73592
+ REGRESSION (r100483): Can't drag out of background window
+ -and corresponding-
+ <rdar://problem/10508870>
+
+ Reviewed by Darin Adler.
+
+ If the mouse is pressed we need to do a full, normal hit test even if the window
+ is not active.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::mouseEvent):
+ (WebKit::WebPage::mouseEventSyncForTesting):
+
+2011-12-08 Lucas Forschler <[email protected]>
+
Merge 101532
2011-11-29 Beth Dakin <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (102373 => 102374)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-12-08 21:07:57 UTC (rev 102373)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-12-08 21:11:44 UTC (rev 102374)
@@ -1084,7 +1084,13 @@
if (!handled) {
CurrentEvent currentEvent(mouseEvent);
- handled = handleMouseEvent(mouseEvent, m_page.get(), !m_page->focusController()->isActive());
+ // We need to do a full, normal hit test during this mouse event if the page is active or if a mouse
+ // button is currently pressed. It is possible that neither of those things will be true since on
+ // Lion when legacy scrollbars are enabled, WebKit receives mouse events all the time. If it is one
+ // of those cases where the page is not active and the mouse is not pressed, then we can fire a more
+ // efficient scrollbars-only version of the event.
+ bool _onlyUpdateScrollbars_ = !(m_page->focusController()->isActive() || (mouseEvent.button() != WebMouseEvent::NoButton));
+ handled = handleMouseEvent(mouseEvent, m_page.get(), onlyUpdateScrollbars);
}
send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
