Regression(r192038): Safari cannot load any pages
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Nov 2015 18:30:51 +0000 (18:30 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Nov 2015 18:30:51 +0000 (18:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150937
<rdar://problem/23413859>

Reviewed by Alex Christensen.

Make sure we use the current "defersLoading" state instead of the
original one when constructing / initializing the NetworkLoad.

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

index 5415625..9ace48c 100644 (file)
@@ -1,3 +1,17 @@
+2015-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r192038): Safari cannot load any pages
+        https://bugs.webkit.org/show_bug.cgi?id=150937
+        <rdar://problem/23413859>
+
+        Reviewed by Alex Christensen.
+
+        Make sure we use the current "defersLoading" state instead of the
+        original one when constructing / initializing the NetworkLoad.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::startNetworkLoad):
+
 2015-11-05  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         [EFL] Add try_close API to handle beforeunload event
index 95eaa1c..c35821c 100644 (file)
@@ -173,6 +173,7 @@ void NetworkResourceLoader::startNetworkLoad(const Optional<ResourceRequest>& up
 #endif
 
     NetworkLoadParameters parameters = m_parameters;
+    parameters.defersLoading = m_defersLoading;
     if (updatedRequest)
         parameters.request = updatedRequest.value();
     m_networkLoad = std::make_unique<NetworkLoad>(*this, parameters);