Changeset 138222 in webkit

Timestamp:

Dec 19, 2012, 9:44:54 PM (12 years ago)

Author:

Nate Chapin

Message:

REGRESSION(r137607): resource load client callbacks are not called for the main resource when loading HTML string
​https://bugs.webkit.org/show_bug.cgi?id=105330

Reviewed by Brady Eidson.

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::responseReceived):
(WebCore::MainResourceLoader::dataReceived):
(WebCore::MainResourceLoader::didFinishLoading):
(WebCore::MainResourceLoader::load):
(WebCore::MainResourceLoader::identifier):

• loader/MainResourceLoader.h:

(MainResourceLoader):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (6 diffs)
• loader/MainResourceLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-19  Nate Chapin  <japhet@chromium.org>
+
+        REGRESSION(r137607): resource load client callbacks are not called for the main resource when loading HTML string
+        https://bugs.webkit.org/show_bug.cgi?id=105330
+
+        Reviewed by Brady Eidson.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::responseReceived):
+        (WebCore::MainResourceLoader::dataReceived):
+        (WebCore::MainResourceLoader::didFinishLoading):
+        (WebCore::MainResourceLoader::load):
+        (WebCore::MainResourceLoader::identifier):
+        * loader/MainResourceLoader.h:
+        (MainResourceLoader):
+
 2012-12-19  Cosmin Truta  <ctruta@rim.com>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -74 +74 @@
     , m_waitingForContentPolicy(false)
     , m_timeOfLastDataReceived(0.0)
+    , m_substituteDataLoadIdentifier(0)
 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     , m_filter(0)
@@ -413 +414 @@
     m_response = r;
 
+    if (!loader())
+        frameLoader()->notifier()->dispatchDidReceiveResponse(documentLoader(), identifier(), m_response, 0);
+
     ASSERT(!m_waitingForContentPolicy);
     m_waitingForContentPolicy = true;
@@ -477 +481 @@
 #endif
 
+    if (!loader())
+        frameLoader()->notifier()->dispatchDidReceiveData(documentLoader(), identifier(), data, length, -1);
+
     documentLoader()->applicationCacheHost()->mainResourceDataReceived(data, length, -1, false);
 
@@ -513 +520 @@
     RefPtr<MainResourceLoader> protect(this);
     RefPtr<DocumentLoader> dl = documentLoader();
+
+    if (!loader())
+        frameLoader()->notifier()->dispatchDidFinishLoading(documentLoader(), identifier(), finishTime);
 
 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
@@ -635 +645 @@
     if (m_substituteData.isValid()) {
         handleSubstituteDataLoadSoon(request);
+        m_substituteDataLoadIdentifier = m_documentLoader->frame()->page()->progress()->createUniqueIdentifier();
+        frameLoader()->notifier()->assignIdentifierToInitialRequest(m_substituteDataLoadIdentifier, documentLoader(), request);
+        frameLoader()->notifier()->dispatchWillSendRequest(documentLoader(), m_substituteDataLoadIdentifier, request, ResourceResponse());
         return;
     }
@@ -680 +693 @@
 unsigned long MainResourceLoader::identifier() const
 {
+    ASSERT(!m_substituteDataLoadIdentifier || !loader() || !loader()->identifier());
+    if (m_substituteDataLoadIdentifier)
+        return m_substituteDataLoadIdentifier;
     if (ResourceLoader* resourceLoader = loader())
         return resourceLoader->identifier();

trunk/Source/WebCore/loader/MainResourceLoader.h

@@ -129 +129 @@
     bool m_waitingForContentPolicy;
     double m_timeOfLastDataReceived;
+    unsigned long m_substituteDataLoadIdentifier;
 
 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080