Title: [171206] branches/safari-600.1-branch
- Revision
- 171206
- Author
- [email protected]
- Date
- 2014-07-17 16:39:18 -0700 (Thu, 17 Jul 2014)
Log Message
Rollout of r171167. <rdar://problem/17716602>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171205 => 171206)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-17 23:37:07 UTC (rev 171205)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-17 23:39:18 UTC (rev 171206)
@@ -1,3 +1,7 @@
+2014-07-17 Lucas Forschler <[email protected]>
+
+ Rollout r171167. <rdar://problem/17716602>
+
2014-07-17 Dean Jackson <[email protected]>
<rdar://problem/17675068> Disable some features on this branch.
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (171205 => 171206)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-17 23:37:07 UTC (rev 171205)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-17 23:39:18 UTC (rev 171206)
@@ -4275,6 +4275,10 @@
resetStateAfterProcessExited();
+ // FIXME: Should we do this when the process exits cleanly, instead of just upon crashing?
+ auto transaction = m_pageLoadState.transaction();
+ m_pageLoadState.reset(transaction);
+
m_loaderClient->processDidCrash(this);
}
@@ -4429,9 +4433,6 @@
dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
m_pageClient.dismissDictionaryLookupPanel();
#endif
-
- auto transaction = m_pageLoadState.transaction();
- m_pageLoadState.reset(transaction);
}
WebPageCreationParameters WebPageProxy::creationParameters()
Modified: branches/safari-600.1-branch/Tools/ChangeLog (171205 => 171206)
--- branches/safari-600.1-branch/Tools/ChangeLog 2014-07-17 23:37:07 UTC (rev 171205)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-07-17 23:39:18 UTC (rev 171206)
@@ -1,3 +1,7 @@
+2014-07-17 Lucas Forschler <[email protected]>
+
+ Rollout r171167. <rdar://problem/17716602>
+
2014-07-16 Alexey Proskuryakov <[email protected]>
A test that hangs at cleanup stage confuses webkitpy hugely
Modified: branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp (171205 => 171206)
--- branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp 2014-07-17 23:37:07 UTC (rev 171205)
+++ branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.cpp 2014-07-17 23:39:18 UTC (rev 171206)
@@ -668,10 +668,6 @@
return m_doneResetting;
}
-void TestController::terminateWebContentProcess()
-{
- WKPageTerminate(m_mainWebView->page());
-}
void TestController::updateWebViewSizeForTest(const TestInvocation& test)
{
Modified: branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h (171205 => 171206)
--- branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h 2014-07-17 23:37:07 UTC (rev 171205)
+++ branches/safari-600.1-branch/Tools/WebKitTestRunner/TestController.h 2014-07-17 23:39:18 UTC (rev 171206)
@@ -97,8 +97,6 @@
bool resetStateToConsistentValues();
void resetPreferencesToConsistentValues();
- void terminateWebContentProcess();
-
WorkQueueManager& workQueueManager() { return m_workQueueManager; }
void setHandlesAuthenticationChallenges(bool value) { m_handlesAuthenticationChallenges = value; }
Modified: branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp (171205 => 171206)
--- branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp 2014-07-17 23:37:07 UTC (rev 171205)
+++ branches/safari-600.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp 2014-07-17 23:39:18 UTC (rev 171206)
@@ -202,10 +202,8 @@
if (m_webProcessIsUnresponsive)
dumpWebProcessUnresponsiveness();
else if (!TestController::shared().resetStateToConsistentValues()) {
- // The process froze while loading about:blank, let's start a fresh one.
- // It would be nice to report that the previous test froze after dumping results, but we have no way to do that.
- TestController::shared().terminateWebContentProcess();
- TestController::shared().resetStateToConsistentValues();
+ m_errorMessage = "Timed out loading about:blank before the next test";
+ dumpWebProcessUnresponsiveness();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
