Title: [110349] trunk/Source/WebCore
Revision
110349
Author
[email protected]
Date
2012-03-09 16:44:47 -0800 (Fri, 09 Mar 2012)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (110348 => 110349)


--- trunk/Source/WebCore/ChangeLog	2012-03-10 00:36:29 UTC (rev 110348)
+++ trunk/Source/WebCore/ChangeLog	2012-03-10 00:44:47 UTC (rev 110349)
@@ -1,3 +1,18 @@
+2012-03-09  Pratik Solanki  <[email protected]>
+
+        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  <[email protected]>
 
         Add roundedPoint to HitTestResult and change platform code to use it

Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (110348 => 110349)


--- trunk/Source/WebCore/loader/ResourceLoader.cpp	2012-03-10 00:36:29 UTC (rev 110348)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp	2012-03-10 00:44:47 UTC (rev 110349)
@@ -113,6 +113,7 @@
     
     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());
         releaseResources();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to