Changeset 157979 in webkit

Timestamp:

Oct 24, 2013, 6:35:45 PM (13 years ago)

Author:

akling@apple.com

Message:

DocumentLoader::cachedResourceLoader() should return a reference.
<​https://webkit.org/b/123303>

..and while we're at it, make DocumentLoader::m_cachedResourceLoader
a Ref, and have CachedResourceLoader::create return a PassRef.

Reviewed by Sam Weinig.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• loader/DocumentLoader.h (modified) (2 diffs)
• loader/SubresourceLoader.cpp (modified) (2 diffs)
• loader/cache/CachedResourceLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Andreas Kling  <akling@apple.com>
+
+        DocumentLoader::cachedResourceLoader() should return a reference.
+        <https://webkit.org/b/123303>
+
+        ..and while we're at it, make DocumentLoader::m_cachedResourceLoader
+        a Ref, and have CachedResourceLoader::create return a PassRef.
+
+        Reviewed by Sam Weinig.
+
 2013-10-24  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -505 +505 @@
 
     if (m_frame)
-        m_cachedResourceLoader = m_frame->loader().activeDocumentLoader()->cachedResourceLoader();
+        m_cachedResourceLoader = &m_frame->loader().activeDocumentLoader()->cachedResourceLoader();
     if (!m_cachedResourceLoader)
         m_cachedResourceLoader = CachedResourceLoader::create(nullptr);

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -105 +105 @@
         ResourceRequest& request();
 
-        CachedResourceLoader* cachedResourceLoader() const { return m_cachedResourceLoader.get(); }
+        CachedResourceLoader& cachedResourceLoader() { return m_cachedResourceLoader.get(); }
 
         const SubstituteData& substituteData() const { return m_substituteData; }
@@ -313 +313 @@
 
         Frame* m_frame;
-        RefPtr<CachedResourceLoader> m_cachedResourceLoader;
+        Ref<CachedResourceLoader> m_cachedResourceLoader;
 
         CachedResourceHandle<CachedRawResource> m_mainResource;

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -138 +138 @@
         }
         
-        if (!m_documentLoader->cachedResourceLoader()->canRequest(m_resource->type(), newRequest.url(), options())) {
+        if (!m_documentLoader->cachedResourceLoader().canRequest(m_resource->type(), newRequest.url(), options())) {
             cancel();
             return;
         }
-        if (m_resource->type() == CachedResource::ImageResource && m_documentLoader->cachedResourceLoader()->shouldDeferImageLoad(newRequest.url())) {
+        if (m_resource->type() == CachedResource::ImageResource && m_documentLoader->cachedResourceLoader().shouldDeferImageLoad(newRequest.url())) {
             cancel();
             return;
@@ -349 +349 @@
 
     m_requestCountTracker.clear();
-    m_documentLoader->cachedResourceLoader()->loadDone(m_resource);
+    m_documentLoader->cachedResourceLoader().loadDone(m_resource);
     if (reachedTerminalState())
         return;

trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

@@ -70 +70 @@
 
 public:
-    static PassRefPtr<CachedResourceLoader> create(DocumentLoader* documentLoader) { return adoptRef(new CachedResourceLoader(documentLoader)); }
+    static PassRef<CachedResourceLoader> create(DocumentLoader* documentLoader) { return adoptRef(*new CachedResourceLoader(documentLoader)); }
     ~CachedResourceLoader();