Merege r241330 - Remove firing assertion after r241317

https://bugs.webkit.org/show_bug.cgi?id=194506 * WebProcess/Network/WebLoaderStrategy.cpp: (WebKit::WebLoaderStrategy::setDefersLoading): The creation of a PageGroupLoadDeferrer in Chrome.cpp tries to defer loading. See comments in Chrome::runJavaScriptAlert et al. This was necessary with WebKitLegacy, so keep it, but it doesn't need to do anything in modern WebKit.
WebKit · Feb 13, 2019 · 71e7544 · 71e7544
1 parent 136c4e7
commit 71e7544
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2019-02-12  Alex Christensen  <achristensen@webkit.org>
+
+        Remove firing assertion after r241317
+        https://bugs.webkit.org/show_bug.cgi?id=194506
+
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::WebLoaderStrategy::setDefersLoading):
+        The creation of a PageGroupLoadDeferrer in Chrome.cpp tries to defer loading.
+        See comments in Chrome::runJavaScriptAlert et al.
+        This was necessary with WebKitLegacy, so keep it, but it doesn't need to do anything in modern WebKit.
+
 2019-02-12  Alex Christensen  <achristensen@webkit.org>
 
         Remove setDefersLoading infrastructure from WebKit2

diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
@@ -427,7 +427,6 @@ void WebLoaderStrategy::remove(ResourceLoader* resourceLoader)
 
 void WebLoaderStrategy::setDefersLoading(ResourceLoader&, bool)
 {
-    ASSERT_NOT_REACHED();
 }
 
 void WebLoaderStrategy::crossOriginRedirectReceived(ResourceLoader*, const URL&)