commit 7bcda283db1bdca0a1cb57234e97fdd48029e4ec
author dbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Apr 26 20:50:16 2018 +0000
committer dbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Apr 26 20:50:16 2018 +0000
tree dddf21c2b63477b93a329ca350aab4b4a53f4bba
parent e6fda2192fcbdbc1ff3a2e51c3569b0e71c8257d

Fix the build following r231068
(https://bugs.webkit.org/show_bug.cgi?id=185002)

Substitute mainResourceRequest.resourceRequest().url() for mainResourceRequest.url() as the
latter does not exist.

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::loadMainResource):

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

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ac10873..3e2f3fc 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2018-04-26  Daniel Bates  <dabates@apple.com>
 
+        Fix the build following r231068
+        (https://bugs.webkit.org/show_bug.cgi?id=185002)
+
+        Substitute mainResourceRequest.resourceRequest().url() for mainResourceRequest.url() as the
+        latter does not exist.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::loadMainResource):
+
+2018-04-26  Daniel Bates  <dabates@apple.com>
+
         DocumentLoader::loadMainResource() should WTFMove() the passed ResourceRequest
         https://bugs.webkit.org/show_bug.cgi?id=185002
 

Source/WebCore/loader/DocumentLoader.cpp

diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
index fa588bd..d0f1474 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
@@ -1737,7 +1737,7 @@
         // If we are loading the main resource of a subframe, use the cache partition of the main document.
         mainResourceRequest.setDomainForCachePartition(*m_frame->document());
     } else {
-        auto origin = SecurityOrigin::create(mainResourceRequest.url());
+        auto origin = SecurityOrigin::create(mainResourceRequest.resourceRequest().url());
         origin->setStorageBlockingPolicy(frameLoader()->frame().settings().storageBlockingPolicy());
         mainResourceRequest.setDomainForCachePartition(origin->domainForCachePartition());
     }