Changeset 163734 in webkit

Timestamp:

Feb 8, 2014, 6:37:38 PM (11 years ago)

Author:

mitz@apple.com

Message:

Remove outdated workarounds in DocumentLoader::dataReceived
​https://bugs.webkit.org/show_bug.cgi?id=128465

Reviewed by Andreas Kling.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::dataReceived):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-08  Dan Bernstein  <mitz@apple.com>
+
+        Remove outdated workarounds in DocumentLoader::dataReceived
+        https://bugs.webkit.org/show_bug.cgi?id=128465
+
+        Reviewed by Andreas Kling.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::dataReceived):
+
 2014-02-08  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -850 +850 @@
     ASSERT_UNUSED(resource, resource == m_mainResource);
     ASSERT(!m_response.isNull());
-
-#if USE(CFNETWORK) || PLATFORM(COCOA)
-    // Workaround for <rdar://problem/6060782>
-    if (m_response.isNull())
-        m_response = ResourceResponse(URL(), "text/html", 0, String(), String());
-#endif
-
-    // 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)