Title: [204841] trunk
- Revision
- 204841
- Author
- [email protected]
- Date
- 2016-08-23 11:09:21 -0700 (Tue, 23 Aug 2016)
Log Message
Unreviewed, rolling out r204243.
Caused some layout test failures
Reverted changeset:
"Write API test to cover crash fix in r204135"
https://bugs.webkit.org/show_bug.cgi?id=160587
http://trac.webkit.org/changeset/204243
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (204840 => 204841)
--- trunk/Source/WebKit2/ChangeLog 2016-08-23 17:32:52 UTC (rev 204840)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-23 18:09:21 UTC (rev 204841)
@@ -1,3 +1,15 @@
+2016-08-23 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r204243.
+
+ Caused some layout test failures
+
+ Reverted changeset:
+
+ "Write API test to cover crash fix in r204135"
+ https://bugs.webkit.org/show_bug.cgi?id=160587
+ http://trac.webkit.org/changeset/204243
+
2016-08-23 Hunseop Jeong <[email protected]>
[EFL] URTBF after r204743.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (204840 => 204841)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-08-23 17:32:52 UTC (rev 204840)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-08-23 18:09:21 UTC (rev 204841)
@@ -2353,6 +2353,7 @@
return;
m_process->requestTermination();
+ resetStateAfterProcessExited();
}
SessionState WebPageProxy::sessionState(const std::function<bool (WebBackForwardListItem&)>& filter) const
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (204840 => 204841)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-08-23 17:32:52 UTC (rev 204840)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-08-23 18:09:21 UTC (rev 204841)
@@ -805,7 +805,10 @@
ChildProcessProxy::terminate();
- didClose(*connection());
+ if (webConnection())
+ webConnection()->didClose();
+
+ shutDown();
}
void WebProcessProxy::enableSuddenTermination()
Modified: trunk/Tools/ChangeLog (204840 => 204841)
--- trunk/Tools/ChangeLog 2016-08-23 17:32:52 UTC (rev 204840)
+++ trunk/Tools/ChangeLog 2016-08-23 18:09:21 UTC (rev 204841)
@@ -1,3 +1,15 @@
+2016-08-23 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r204243.
+
+ Caused some layout test failures
+
+ Reverted changeset:
+
+ "Write API test to cover crash fix in r204135"
+ https://bugs.webkit.org/show_bug.cgi?id=160587
+ http://trac.webkit.org/changeset/204243
+
2016-08-23 Rawinder Singh <[email protected]>
Order feature option list in FeatureList.pm
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm (204840 => 204841)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2016-08-23 17:32:52 UTC (rev 204840)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2016-08-23 18:09:21 UTC (rev 204841)
@@ -27,11 +27,7 @@
#import <WebKit/WKNavigationPrivate.h>
#import <WebKit/WKNavigationDelegate.h>
-#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKWebView.h>
-#import <WebKit/WKWebViewConfigurationPrivate.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/_WKProcessPoolConfiguration.h>
#import <wtf/RetainPtr.h>
#import "PlatformUtilities.h"
#import "Test.h"
@@ -39,7 +35,6 @@
#if WK_API_ENABLED
static bool isDone;
-static std::function<void()> crashHandler;
static RetainPtr<WKNavigation> currentNavigation;
@interface NavigationDelegate : NSObject <WKNavigationDelegate>
@@ -65,11 +60,6 @@
isDone = true;
}
-- (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView
-{
- crashHandler();
-}
-
@end
TEST(WKNavigation, NavigationDelegate)
@@ -197,48 +187,4 @@
ASSERT_TRUE([delegate decidedPolicyForBackForwardNavigation]);
}
-TEST(WKNavigation, WebContentProcessDidTerminate)
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- RetainPtr<_WKProcessPoolConfiguration> poolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
- poolConfiguration.get().maximumProcessCount = 1;
- RetainPtr<WKProcessPool> processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:poolConfiguration.get()]);
-
- RetainPtr<WKWebViewConfiguration> configuration1 = adoptNS([[WKWebViewConfiguration alloc] init]);
- configuration1.get().processPool = processPool.get();
- RetainPtr<WKWebView> webView1 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration1.get()]);
-
- RetainPtr<NavigationDelegate> delegate1 = adoptNS([[NavigationDelegate alloc] init]);
- [webView1 setNavigationDelegate:delegate1.get()];
-
- NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"data:text/html,1"]];
-
- isDone = false;
- currentNavigation = [webView1 loadRequest:request];
- TestWebKitAPI::Util::run(&isDone);
-
- RetainPtr<WKWebViewConfiguration> configuration2 = adoptNS([[WKWebViewConfiguration alloc] init]);
- configuration2.get().processPool = processPool.get();
- configuration2.get()._relatedWebView = webView1.get();
- RetainPtr<WKWebView> webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration2.get()]);
-
- RetainPtr<NavigationDelegate> delegate2 = adoptNS([[NavigationDelegate alloc] init]);
- [webView2 setNavigationDelegate:delegate2.get()];
-
- isDone = false;
- currentNavigation = [webView2 loadRequest:request];
- TestWebKitAPI::Util::run(&isDone);
-
- bool didTerminate = false;
- crashHandler = [&] {
- webView1 = nullptr;
- webView2 = nullptr;
- [pool drain]; // Make sure the views get deallocated.
- didTerminate = true;
- };
-
- [webView2 _killWebContentProcessAndResetState];
- TestWebKitAPI::Util::run(&didTerminate);
-}
-
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
