Title: [126373] trunk/Source/WebCore
- Revision
- 126373
- Author
- [email protected]
- Date
- 2012-08-22 18:07:22 -0700 (Wed, 22 Aug 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126372 => 126373)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 01:00:10 UTC (rev 126372)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 01:07:22 UTC (rev 126373)
@@ -1,3 +1,18 @@
+2012-08-22 Kenneth Russell <[email protected]>
+
+ 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 <[email protected]>
Display a TextTrackCue when snap-to-lines flag is set
Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (126372 => 126373)
--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2012-08-23 01:00:10 UTC (rev 126372)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2012-08-23 01:07:22 UTC (rev 126373)
@@ -589,6 +589,10 @@
}
// 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();
}
}
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (126372 => 126373)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-08-23 01:00:10 UTC (rev 126372)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-08-23 01:07:22 UTC (rev 126373)
@@ -38,7 +38,6 @@
#include "ContentSecurityPolicy.h"
#include "DOMWindow.h"
#include "Document.h"
-#include "DocumentLoader.h"
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
@@ -726,12 +725,6 @@
--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();
}
void CachedResourceLoader::preload(CachedResource::Type type, ResourceRequest& request, const String& charset, bool referencedFromBody)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
