Title: [151234] trunk/Source/WebKit2
- Revision
- 151234
- Author
- [email protected]
- Date
- 2013-06-05 12:41:38 -0700 (Wed, 05 Jun 2013)
Log Message
REGRESSION (r148713): Crash under waitForDidUpdateInWindowState
https://bugs.webkit.org/show_bug.cgi?id=117268
<rdar://problem/13822353>
Reviewed by Anders Carlsson.
Check if the WebProcess is valid before waiting for a message from it.
Reset the bool that tells us that we have an outstanding didUpdateInWindowState message if the WebProcess quits.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::waitForDidUpdateInWindowState):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (151233 => 151234)
--- trunk/Source/WebKit2/ChangeLog 2013-06-05 19:38:55 UTC (rev 151233)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-05 19:41:38 UTC (rev 151234)
@@ -1,3 +1,18 @@
+2013-06-05 Tim Horton <[email protected]>
+
+ REGRESSION (r148713): Crash under waitForDidUpdateInWindowState
+ https://bugs.webkit.org/show_bug.cgi?id=117268
+ <rdar://problem/13822353>
+
+ Reviewed by Anders Carlsson.
+
+ Check if the WebProcess is valid before waiting for a message from it.
+ Reset the bool that tells us that we have an outstanding didUpdateInWindowState message if the WebProcess quits.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::waitForDidUpdateInWindowState):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+
2013-06-05 Gwang Yoon Hwang <[email protected]>
[Coordinated Graphics] Prevent a recursive painting in CoordinatedGraphicsLayer
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (151233 => 151234)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-06-05 19:38:55 UTC (rev 151233)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-06-05 19:41:38 UTC (rev 151234)
@@ -1104,6 +1104,9 @@
if (m_waitingForDidUpdateInWindowState)
return;
+ if (!isValid())
+ return;
+
m_waitingForDidUpdateInWindowState = true;
if (!m_process->isLaunching()) {
@@ -3847,6 +3850,7 @@
m_isValid = false;
m_isPageSuspended = false;
+ m_waitingForDidUpdateInWindowState = false;
if (m_mainFrame) {
m_urlAtProcessExit = m_mainFrame->url();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
