Changeset 87679 in webkit

Timestamp:

May 30, 2011 12:45:41 AM (13 years ago)

Author:

Nate Chapin

Message:

2011-05-30 Nate Chapin <Nate Chapin>

Reviewed by Antti Koivisto.

Refactor the CachedResourceLoader -> CachedResource -> CachedResourceRequest
flow so it's a little less circular.
​https://bugs.webkit.org/show_bug.cgi?id=61666

• loader/cache/CachedFont.cpp: (WebCore::CachedFont::beginLoadIfNeeded):
• loader/cache/CachedResource.cpp: (WebCore::CachedResource::load):
• loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::requestImage): (WebCore::CachedResourceLoader::setAutoLoadImages): (WebCore::CachedResourceLoader::loadStarted):
• loader/cache/CachedResourceLoader.h:
• loader/cache/CachedResourceRequest.cpp: (WebCore::CachedResourceRequest::load):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedFont.cpp (modified) (1 diff)
• loader/cache/CachedResource.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (3 diffs)
• loader/cache/CachedResourceLoader.h (modified) (1 diff)
• loader/cache/CachedResourceRequest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-30  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Antti Koivisto.
+
+        Refactor the CachedResourceLoader -> CachedResource -> CachedResourceRequest
+        flow so it's a little less circular.
+        https://bugs.webkit.org/show_bug.cgi?id=61666
+
+        * loader/cache/CachedFont.cpp:
+        (WebCore::CachedFont::beginLoadIfNeeded):
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::load):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestImage):
+        (WebCore::CachedResourceLoader::setAutoLoadImages):
+        (WebCore::CachedResourceLoader::loadStarted):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/CachedResourceRequest.cpp:
+        (WebCore::CachedResourceRequest::load):
+
 2011-05-30  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/loader/cache/CachedFont.cpp

@@ -98 +98 @@
     if (!m_loadInitiated) {
         m_loadInitiated = true;
-        dl->load(this, false);
+        CachedResource::load(dl);
     }
 }

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -136 +136 @@
 {
     m_sendResourceLoadCallbacks = sendResourceLoadCallbacks;
-    cachedResourceLoader->load(this, incremental, securityCheck, sendResourceLoadCallbacks);
     m_loading = true;
+    RefPtr<CachedResourceRequest> request = CachedResourceRequest::load(cachedResourceLoader, this, incremental, securityCheck, sendResourceLoadCallbacks);
+    if (request)
+        cachedResourceLoader->loadStarted(this, request);
 }
 

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

@@ -140 +140 @@
     }
     CachedImage* resource = static_cast<CachedImage*>(requestResource(CachedResource::ImageResource, request, String()));
-    if (autoLoadImages() && resource && resource->stillNeedsLoad()) {
-        resource->setLoading(true);
-        load(resource, true);
-    }
+    if (autoLoadImages() && resource && resource->stillNeedsLoad())
+        resource->load(this);
     return resource;
 }
@@ -537 +535 @@
 
             if (image->stillNeedsLoad())
-                load(image, true);
+                image->load(this);
         }
     }
@@ -557 +555 @@
 }
 
-void CachedResourceLoader::load(CachedResource* resource, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks)
-{
+void CachedResourceLoader::loadStarted(CachedResource* resource, PassRefPtr<CachedResourceRequest> request)
+{
+    ASSERT(request);
     incrementRequestCount(resource);
-
-    RefPtr<CachedResourceRequest> request = CachedResourceRequest::load(this, resource, incremental, securityCheck, sendResourceLoadCallbacks);
-    if (request)
-        m_requests.add(request);
+    m_requests.add(request);
 }
 

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

@@ -93 +93 @@
     void removeCachedResource(CachedResource*) const;
 
-    void load(CachedResource*, bool incremental = false, SecurityCheckPolicy = DoSecurityCheck, bool sendResourceLoadCallbacks = true);
+    void loadStarted(CachedResource*, PassRefPtr<CachedResourceRequest>);
     void loadFinishing() { m_loadFinishing = true; }
     void loadDone(CachedResourceRequest*);

trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp

@@ -128 +128 @@
         // FIXME: What if resources in other frames were waiting for this revalidation?
         LOG(ResourceLoading, "Cannot start loading '%s'", resource->url().string().latin1().data());
-        cachedResourceLoader->decrementRequestCount(resource);
-        cachedResourceLoader->loadFinishing();
         if (resource->resourceToRevalidate()) 
             memoryCache()->revalidationFailed(resource); 
         resource->error(CachedResource::LoadError);
-        cachedResourceLoader->loadDone(0);
         return 0;
     }