Changeset 117181 in webkit

Timestamp:

May 15, 2012 4:31:43 PM (12 years ago)

Author:

Nate Chapin

Message:

MainResourceLoader::load() always returns true, so make it return
void and delete the related dead code.
​https://bugs.webkit.org/show_bug.cgi?id=86413

Reviewed by Alexey Proskuryakov.

No new tests, cleanup only.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::startLoadingMainResource):

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::load):

• loader/MainResourceLoader.h:

(MainResourceLoader):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (2 diffs)
• loader/MainResourceLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Nate Chapin  <japhet@chromium.org>
+
+        MainResourceLoader::load() always returns true, so make it return
+        void and delete the related dead code.
+        https://bugs.webkit.org/show_bug.cgi?id=86413
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests, cleanup only.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::startLoadingMainResource):
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::load):
+        * loader/MainResourceLoader.h:
+        (MainResourceLoader):
+
 2012-05-15  Ian Vollick  <vollick@chromium.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -838 +838 @@
     // If not, it would be great to remove this line of code.
     frameLoader()->addExtraFieldsToMainResourceRequest(m_request);
-    
-    // Protect MainResourceLoader::load() method chain from clearMainResourceLoader() stomping m_mainResourceLoader.
-    RefPtr<MainResourceLoader> protectedMainResourceLoader(m_mainResourceLoader);
-    if (!protectedMainResourceLoader->load(m_request, m_substituteData)) {
-        // FIXME: If this should really be caught, we should just ASSERT this doesn't happen;
-        // should it be caught by other parts of WebKit or other parts of the app?
-        LOG_ERROR("could not create WebResourceHandle for URL %s -- should be caught by policy handler level", m_request.url().string().ascii().data());
-        m_mainResourceLoader = 0;
-        ASSERT(!isLoading());
-        checkLoadComplete();
-    }
+    m_mainResourceLoader->load(m_request, m_substituteData);
 }
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -652 +652 @@
 }
 
-bool MainResourceLoader::load(const ResourceRequest& r, const SubstituteData& substituteData)
+void MainResourceLoader::load(const ResourceRequest& r, const SubstituteData& substituteData)
 {
     ASSERT(!m_handle);
+
+    // It appears that it is possible for this load to be cancelled and derefenced by the DocumentLoader
+    // in willSendRequest() if loadNow() is called.
+    RefPtr<MainResourceLoader> protect(this);
 
     m_substituteData = substituteData;
@@ -680 +684 @@
     if (defer)
         m_initialRequest = request;
-
-    return true;
 }
 

trunk/Source/WebCore/loader/MainResourceLoader.h

@@ -55 +55 @@
         virtual ~MainResourceLoader();
 
-        virtual bool load(const ResourceRequest&, const SubstituteData&);
+        void load(const ResourceRequest&, const SubstituteData&);
         virtual void addData(const char*, int, bool allAtOnce);