Changeset 126373 in webkit

Timestamp:

Aug 22, 2012 6:07:22 PM (12 years ago)

Author:

kbr@google.com

Message:

Unreviewed, rolling out r126325.
​http://trac.webkit.org/changeset/126325
​https://bugs.webkit.org/show_bug.cgi?id=94644

Caused subtle but reproducible failure to call onload handler
properly in an SVG layout test in Chromium Mac Debug builds,
indicating potentially larger problem

• css/CSSFontSelector.cpp:

(WebCore::CSSFontSelector::beginLoadTimerFired):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::decrementRequestCount):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFontSelector.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-22  Kenneth Russell  <kbr@google.com>
+
+        Unreviewed, rolling out r126325.
+        http://trac.webkit.org/changeset/126325
+        https://bugs.webkit.org/show_bug.cgi?id=94644
+
+        Caused subtle but reproducible failure to call onload handler
+        properly in an SVG layout test in Chromium Mac Debug builds,
+        indicating potentially larger problem
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::beginLoadTimerFired):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::decrementRequestCount):
+
 2012-08-22  Victor Carbune  <victor@rosedu.org>
 

trunk/Source/WebCore/css/CSSFontSelector.cpp

@@ -590 +590 @@
     // Ensure that if the request count reaches zero, the frame loader will know about it.
     cachedResourceLoader->loadDone();
-}
-
-}
+    // New font loads may be triggered by layout after the document load is complete but before we have dispatched
+    // didFinishLoading for the frame. Make sure the delegate is always dispatched by checking explicitly.
+    if (m_document && m_document->frame())
+        m_document->frame()->loader()->checkLoadComplete();
+}
+
+}

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -39 +39 @@
 #include "DOMWindow.h"
 #include "Document.h"
-#include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -727 +726 @@
     --m_requestCount;
     ASSERT(m_requestCount > -1);
-
-    // New resource loads (e.g. font loads) may be triggered by layout after the document load is
-    // complete but before we have dispatched didFinishLoading for the frame. Make sure the delegate
-    // is always dispatched by checking explicitly once we are done loading all resources.
-    if (!m_requestCount && m_document && m_document->loader() && m_document->loader()->frameLoader())
-        m_document->loader()->frameLoader()->checkLoadComplete();
 }