Title: [204026] trunk/Source/WebCore
Revision
204026
Author
commit-qu...@webkit.org
Date
2016-08-02 08:46:10 -0700 (Tue, 02 Aug 2016)

Log Message

Remove CachedResourceRequest initiatingDocumentLoader
https://bugs.webkit.org/show_bug.cgi?id=160449

Patch by Youenn Fablet <you...@apple.com> on 2016-08-02
Reviewed by Alex Christensen.

No change of behavior.

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::startLoadingMainResource): Removing call to setInitiator.
* loader/cache/CachedResourceRequest.cpp:
(WebCore::CachedResourceRequest::setInitiator): Deleted.
* loader/cache/CachedResourceRequest.h:
(WebCore::CachedResourceRequest::initiatingDocumentLoader): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (204025 => 204026)


--- trunk/Source/WebCore/ChangeLog	2016-08-02 15:37:23 UTC (rev 204025)
+++ trunk/Source/WebCore/ChangeLog	2016-08-02 15:46:10 UTC (rev 204026)
@@ -1,3 +1,19 @@
+2016-08-02  Youenn Fablet  <you...@apple.com>
+
+        Remove CachedResourceRequest initiatingDocumentLoader
+        https://bugs.webkit.org/show_bug.cgi?id=160449
+
+        Reviewed by Alex Christensen.
+
+        No change of behavior.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::startLoadingMainResource): Removing call to setInitiator.
+        * loader/cache/CachedResourceRequest.cpp:
+        (WebCore::CachedResourceRequest::setInitiator): Deleted.
+        * loader/cache/CachedResourceRequest.h:
+        (WebCore::CachedResourceRequest::initiatingDocumentLoader): Deleted.
+
 2016-07-28  Frederic Wang  <fw...@igalia.com>
 
         Move parsing of the form attribute to MathMLOperatorElement

Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (204025 => 204026)


--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2016-08-02 15:37:23 UTC (rev 204025)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2016-08-02 15:46:10 UTC (rev 204026)
@@ -1512,7 +1512,6 @@
 
     static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, SkipSecurityCheck, FetchOptions::Mode::NoCors, IncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching);
     CachedResourceRequest cachedResourceRequest(ResourceRequest(request), mainResourceLoadOptions);
-    cachedResourceRequest.setInitiator(*this);
     m_mainResource = m_cachedResourceLoader->requestMainResource(cachedResourceRequest);
 
 #if ENABLE(CONTENT_EXTENSIONS)

Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (204025 => 204026)


--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp	2016-08-02 15:37:23 UTC (rev 204025)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp	2016-08-02 15:46:10 UTC (rev 204026)
@@ -77,11 +77,6 @@
     m_initiatorName = name;
 }
 
-void CachedResourceRequest::setInitiator(DocumentLoader& documentLoader)
-{
-    m_initiatingDocumentLoader = &documentLoader;
-}
-
 const AtomicString& CachedResourceRequest::initiatorName() const
 {
     if (m_initiatorElement)

Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (204025 => 204026)


--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h	2016-08-02 15:37:23 UTC (rev 204025)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h	2016-08-02 15:46:10 UTC (rev 204026)
@@ -62,9 +62,6 @@
     const AtomicString& initiatorName() const;
     bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; }
 
-    void setInitiator(DocumentLoader&);
-    DocumentLoader* initiatingDocumentLoader() const { return m_initiatingDocumentLoader.get(); }
-
     void setAsPotentiallyCrossOrigin(const String&, Document&);
 
 private:
@@ -76,7 +73,6 @@
     DeferOption m_defer;
     RefPtr<Element> m_initiatorElement;
     AtomicString m_initiatorName;
-    RefPtr<DocumentLoader> m_initiatingDocumentLoader;
 };
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to