Title: [228711] trunk
Revision
228711
Author
ryanhad...@apple.com
Date
2018-02-19 14:20:13 -0800 (Mon, 19 Feb 2018)

Log Message

Unreviewed, rolling out r228696.

The API test added with this change is timing out on macOS.

Reverted changeset:

"Null pointer dereference in
WebPageProxy::urlSchemeHandlerForScheme()"
https://bugs.webkit.org/show_bug.cgi?id=182905
https://trac.webkit.org/changeset/228696

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (228710 => 228711)


--- trunk/Source/WebKit/ChangeLog	2018-02-19 22:01:51 UTC (rev 228710)
+++ trunk/Source/WebKit/ChangeLog	2018-02-19 22:20:13 UTC (rev 228711)
@@ -1,3 +1,16 @@
+2018-02-19  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r228696.
+
+        The API test added with this change is timing out on macOS.
+
+        Reverted changeset:
+
+        "Null pointer dereference in
+        WebPageProxy::urlSchemeHandlerForScheme()"
+        https://bugs.webkit.org/show_bug.cgi?id=182905
+        https://trac.webkit.org/changeset/228696
+
 2018-02-19  Daniel Bates  <daba...@apple.com>
 
         Null pointer dereference in WebPageProxy::urlSchemeHandlerForScheme()

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (228710 => 228711)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-02-19 22:01:51 UTC (rev 228710)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-02-19 22:20:13 UTC (rev 228711)
@@ -7199,7 +7199,7 @@
 
 WebURLSchemeHandler* WebPageProxy::urlSchemeHandlerForScheme(const String& scheme)
 {
-    return scheme.isNull() ? nullptr : m_urlSchemeHandlersByScheme.get(scheme);
+    return m_urlSchemeHandlersByScheme.get(scheme);
 }
 
 void WebPageProxy::startURLSchemeTask(URLSchemeTaskParameters&& parameters)

Modified: trunk/Tools/ChangeLog (228710 => 228711)


--- trunk/Tools/ChangeLog	2018-02-19 22:01:51 UTC (rev 228710)
+++ trunk/Tools/ChangeLog	2018-02-19 22:20:13 UTC (rev 228711)
@@ -1,3 +1,16 @@
+2018-02-19  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r228696.
+
+        The API test added with this change is timing out on macOS.
+
+        Reverted changeset:
+
+        "Null pointer dereference in
+        WebPageProxy::urlSchemeHandlerForScheme()"
+        https://bugs.webkit.org/show_bug.cgi?id=182905
+        https://trac.webkit.org/changeset/228696
+
 2018-02-16  Ryosuke Niwa  <rn...@webkit.org>
 
         Add an entitlement check for service worker on iOS

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm (228710 => 228711)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm	2018-02-19 22:01:51 UTC (rev 228710)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm	2018-02-19 22:20:13 UTC (rev 228711)
@@ -561,29 +561,6 @@
     TestWebKitAPI::Util::run(&done);
 }
 
-@interface DecidePolicyForNavigationActionForMalformedURLDelegate : NSObject <WKNavigationDelegate>
-@end
-
-@implementation DecidePolicyForNavigationActionForMalformedURLDelegate
-
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
-{
-    finishedNavigation = true;
-}
-
-@end
-
-TEST(WebKit, DecidePolicyForNavigationActionForMalformedURL)
-{
-    auto webView = adoptNS([[WKWebView alloc] init]);
-    auto controller = adoptNS([[DecidePolicyForNavigationActionForMalformedURLDelegate alloc] init]);
-    [webView setNavigationDelegate:controller.get()];
-
-    finishedNavigation = false;
-    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"N"]]];
-    TestWebKitAPI::Util::run(&finishedNavigation);
-}
-
 #endif
 
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to