Changeset 110349 in webkit

Timestamp:

Mar 9, 2012 4:44:47 PM (12 years ago)

Author:

psolanki@apple.com

Message:

Assertion failure in ResourceHandle::setDefersLoading(): d->m_defersLoading != defers
​https://bugs.webkit.org/show_bug.cgi?id=80543

Reviewed by Geoffrey Garen.

Reset m_defersLoading flag to the value from Page::defersCallbacks() in
ResourceLoader::init(). This is because the resource could have been in the pending requests
queue in ResourceLoadScheduler and would have missed out on state changes to this flag
happening from DocumentLoader::setDefersCallbacks().

• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::init):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-09  Pratik Solanki  <psolanki@apple.com>
+
+        Assertion failure in ResourceHandle::setDefersLoading(): d->m_defersLoading != defers
+        https://bugs.webkit.org/show_bug.cgi?id=80543
+
+        Reviewed by Geoffrey Garen.
+
+        Reset m_defersLoading flag to the value from Page::defersCallbacks() in
+        ResourceLoader::init(). This is because the resource could have been in the pending requests
+        queue in ResourceLoadScheduler and would have missed out on state changes to this flag
+        happening from DocumentLoader::setDefersCallbacks().
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::init):
+
 2012-03-09  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/loader/ResourceLoader.cpp

@@ -114 +114 @@
     ResourceRequest clientRequest(r);
     
+    m_defersLoading = m_frame->page()->defersLoading();
     if (m_options.securityCheck == DoSecurityCheck && !m_frame->document()->securityOrigin()->canDisplay(clientRequest.url())) {
         FrameLoader::reportLocalLoadFailed(m_frame.get(), clientRequest.url().string());