Title: [163738] trunk/Source/WebCore
- Revision
- 163738
- Author
- m...@apple.com
- Date
- 2014-02-08 20:31:18 -0800 (Sat, 08 Feb 2014)
Log Message
Reverted part of r163734, because the assertion it enabled still fails when running
loader/load-defer-resume-crash.html
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::dataReceived):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163737 => 163738)
--- trunk/Source/WebCore/ChangeLog 2014-02-09 03:51:46 UTC (rev 163737)
+++ trunk/Source/WebCore/ChangeLog 2014-02-09 04:31:18 UTC (rev 163738)
@@ -1,3 +1,11 @@
+2014-02-08 Dan Bernstein <m...@apple.com>
+
+ Reverted part of r163734, because the assertion it enabled still fails when running
+ loader/load-defer-resume-crash.html
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::dataReceived):
+
2014-02-08 Ryosuke Niwa <rn...@webkit.org>
EFL build fix after r163729.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (163737 => 163738)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-09 03:51:46 UTC (rev 163737)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-09 04:31:18 UTC (rev 163738)
@@ -849,7 +849,12 @@
ASSERT(length);
ASSERT_UNUSED(resource, resource == m_mainResource);
ASSERT(!m_response.isNull());
+
+ // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
+ // See <rdar://problem/6304600> for more details.
+#if !USE(CF)
ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading());
+#endif
#if USE(CONTENT_FILTERING)
bool loadWasBlockedBeforeFinishing = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
