Changeset 139350 in webkit

Timestamp:

Jan 10, 2013, 12:21:35 PM (12 years ago)

Author:

Nate Chapin

Message:

Replace unnecessary null-checks with an assert in MainResourceLoader::continueAfterNavigationPolicy.
​https://bugs.webkit.org/show_bug.cgi?id=106476

Reviewed by Alexey Proskuryakov.

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::continueAfterNavigationPolicy): Null-checks for resourceLoader were

added in an abundance of caution in r139150. Given that we know the load hasn't been cancelled,
resourceLoader can only be null if continueAfterNavigationPolicy() has already been called
before when m_substituteData is valid. continueAfterNavigationPolicy() is only called for redirects,
and SubstituteData doesn't support redirects, so it is correct to assert that resourceLoader is non-null.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-10  Nate Chapin  <japhet@chromium.org>
+
+        Replace unnecessary null-checks with an assert in MainResourceLoader::continueAfterNavigationPolicy.
+        https://bugs.webkit.org/show_bug.cgi?id=106476
+
+        Reviewed by Alexey Proskuryakov.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::continueAfterNavigationPolicy): Null-checks for resourceLoader were
+            added in an abundance of caution in r139150. Given that we know the load hasn't been cancelled,
+            resourceLoader can only be null if continueAfterNavigationPolicy() has already been called
+            before when m_substituteData is valid. continueAfterNavigationPolicy() is only called for redirects,
+            and SubstituteData doesn't support redirects, so it is correct to assert that resourceLoader is non-null.
+
 2013-01-10  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -195 +195 @@
         // but prevent the ResourceLoader from sending ResourceLoadNotifier callbacks.
         RefPtr<ResourceLoader> resourceLoader = loader();
-        ASSERT(!resourceLoader || resourceLoader->shouldSendResourceLoadCallbacks());
-        if (resourceLoader)
-            resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
+        ASSERT(resourceLoader->shouldSendResourceLoadCallbacks());
+        resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
         clearResource();
-        if (resourceLoader)
-            resourceLoader->setSendCallbackPolicy(SendCallbacks);
+        resourceLoader->setSendCallbackPolicy(SendCallbacks);
         handleSubstituteDataLoadSoon(request);
     }