Changeset 139150 in webkit

Timestamp:

Jan 8, 2013 7:30:43 PM (11 years ago)

Author:

Nate Chapin

Message:

REGRESSION(r138222?): [Mac WK1] http/tests/appcache/main-resource-redirect.html asserts in WebFrameLoaderClient::dispatchDidFinishLoading
​https://bugs.webkit.org/show_bug.cgi?id=106123

Reviewed by Alexey Proskuryakov.

Source/WebCore:

No new tests, fixing an existing test.

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::continueAfterNavigationPolicy): Before calling m_resource->removeClient(this)

and potentially canceling the ResourceLoader, ensure it won't send resource load callbacks.

• loader/ResourceLoader.h:

(WebCore::ResourceLoader::setSendCallbackPolicy):

LayoutTests:

• platform/mac-wk2/TestExpectations:
• platform/mac/TestExpectations: main-resource-redirect.html is no longer crashing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/MainResourceLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/ResourceLoader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-08  Nate Chapin  <japhet@chromium.org>
+
+        REGRESSION(r138222?): [Mac WK1] http/tests/appcache/main-resource-redirect.html asserts in WebFrameLoaderClient::dispatchDidFinishLoading
+        https://bugs.webkit.org/show_bug.cgi?id=106123
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/mac-wk2/TestExpectations:
+        * platform/mac/TestExpectations: main-resource-redirect.html is no longer crashing.
+
 2013-01-08  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -296 +296 @@
 webkit.org/b/93552 inspector/device-orientation-success.html [ Failure ]
 
-webkit.org/b/106123 http/tests/appcache/main-resource-redirect.html [ Pass ]
-
 webkit.org/b/106187 platform/mac/tiled-drawing/fixed/absolute-inside-out-of-view-fixed.html [ Failure ]
 webkit.org/b/106187 platform/mac/tiled-drawing/fixed/four-bars-zoomed.html [ Failure ]

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1264 +1264 @@
 webkit.org/b/106075 [ Debug ] fast/regions/full-screen-video-from-region.html [ Crash ]
 
-webkit.org/b/106123 http/tests/appcache/main-resource-redirect.html [ Crash ]
-
 webkit.org/b/106151 [ Lion ] http/tests/misc/link-rel-icon-beforeload.html [ Pass Failure ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-08  Nate Chapin  <japhet@chromium.org>
+
+        REGRESSION(r138222?): [Mac WK1] http/tests/appcache/main-resource-redirect.html asserts in WebFrameLoaderClient::dispatchDidFinishLoading
+        https://bugs.webkit.org/show_bug.cgi?id=106123
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests, fixing an existing test.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::continueAfterNavigationPolicy): Before calling m_resource->removeClient(this)
+            and potentially canceling the ResourceLoader, ensure it won't send resource load callbacks.
+        * loader/ResourceLoader.h:
+        (WebCore::ResourceLoader::setSendCallbackPolicy):
+
 2013-01-08  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -182 +182 @@
         // A redirect resulted in loading substitute data.
         ASSERT(documentLoader()->timing()->redirectCount());
+
+        // We need to remove our reference to the CachedResource in favor of a SubstituteData load.
+        // This will probably trigger the cancellation of the CachedResource's underlying ResourceLoader, though there is a
+        // small chance that the resource is being loaded by a different Frame, preventing the ResourceLoader from being cancelled.
+        // If the ResourceLoader is indeed cancelled, it would normally send resource load callbacks.
+        // However, from an API perspective, this isn't a cancellation. Therefore, sever our relationship with the network load via clearResource(),
+        // but prevent the ResourceLoader from sending ResourceLoadNotifier callbacks.
+        RefPtr<ResourceLoader> resourceLoader = loader();
+        ASSERT(!resourceLoader || resourceLoader->shouldSendResourceLoadCallbacks());
+        if (resourceLoader)
+            resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
         clearResource();
+        if (resourceLoader)
+            resourceLoader->setSendCallbackPolicy(SendCallbacks);
         handleSubstituteDataLoadSoon(request);
     }

trunk/Source/WebCore/loader/ResourceLoader.h

@@ -141 +141 @@
     ResourceHandle* handle() const { return m_handle.get(); }
     bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
+    void setSendCallbackPolicy(SendCallbackPolicy sendLoadCallbacks) { m_options.sendLoadCallbacks = sendLoadCallbacks; }
     bool shouldSniffContent() const { return m_options.sniffContent == SniffContent; }