Title: [87242] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87241 => 87242)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-25 00:27:35 UTC (rev 87241)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-25 00:29:21 UTC (rev 87242)
@@ -1,5 +1,21 @@
2011-05-24 Lucas Forschler <[email protected]>
+ Merged r87170.
+
+ 2011-05-24 Sam Weinig <[email protected]>
+
+ Reviewed by John Sullivan.
+
+ WebKit tells client that the page has become unresponsive while the beforeUnloadConfirm dialog is up
+ https://bugs.webkit.org/show_bug.cgi?id=61372
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runBeforeUnloadConfirmPanel):
+ Stop the unresponsiveness timer like we do for other client functions that spin a
+ runloop.
+
+2011-05-24 Lucas Forschler <[email protected]>
+
Merged r87221.
2011-05-24 Brady Eidson <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (87241 => 87242)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-05-25 00:27:35 UTC (rev 87241)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-05-25 00:29:21 UTC (rev 87242)
@@ -2057,6 +2057,9 @@
WebFrameProxy* frame = process()->webFrame(frameID);
MESSAGE_CHECK(frame);
+ // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer.
+ process()->responsivenessTimer()->stop();
+
shouldClose = m_uiClient.runBeforeUnloadConfirmPanel(this, message, frame);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
