Title: [231071] trunk/Source/WebCore
Revision
231071
Author
[email protected]
Date
2018-04-26 13:50:16 -0700 (Thu, 26 Apr 2018)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (231070 => 231071)


--- trunk/Source/WebCore/ChangeLog	2018-04-26 20:47:17 UTC (rev 231070)
+++ trunk/Source/WebCore/ChangeLog	2018-04-26 20:50:16 UTC (rev 231071)
@@ -1,5 +1,16 @@
 2018-04-26  Daniel Bates  <[email protected]>
 
+        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  <[email protected]>
+
         DocumentLoader::loadMainResource() should WTFMove() the passed ResourceRequest
         https://bugs.webkit.org/show_bug.cgi?id=185002
 

Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (231070 => 231071)


--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2018-04-26 20:47:17 UTC (rev 231070)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2018-04-26 20:50:16 UTC (rev 231071)
@@ -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());
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to