Web Inspector: [Regression] xhr tests are crashing after r108506.

https://bugs.webkit.org/show_bug.cgi?id=79265

Reviewed by Pavel Feldman.

Source/WebCore:

* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::setInitialScriptContent):
(WebCore::InspectorResourceAgent::setInitialXHRContent):

LayoutTests:

* platform/chromium/test_expectations.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 618c156..1af3146 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-22  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: [Regression] xhr tests are crashing after r108506.
+        https://bugs.webkit.org/show_bug.cgi?id=79265
+
+        Reviewed by Pavel Feldman.
+
+        * platform/chromium/test_expectations.txt:
+
 2012-02-24  Mathias Bynens  <mathias@qiwi.be>
 
         `\u200c` and `\u200d` should be allowed in IdentifierPart, as per ES5

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 8aeee9b..c09c2e1 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -4212,12 +4212,6 @@ BUGWK75091 SKIP : svg/custom/text-ctm.svg = FAIL
 BUGWK75091 SKIP : svg/custom/use-detach.svg = FAIL
 BUGWK75091 SKIP : svg/hixie/perf/003.xml = FAIL
 
-// Asserting in debug builds since r108506
-BUGWK79229 WIN LINUX DEBUG : http/tests/inspector/console-xhr-logging-async.html = CRASH
-BUGWK79229 MAC DEBUG : http/tests/inspector/console-xhr-logging-async.html = TIMEOUT
-BUGWK79229 WIN LINUX DEBUG : http/tests/inspector/network/network-disable-cache-xhrs.html = CRASH
-BUGWK79229 MAC DEBUG : http/tests/inspector/network/network-disable-cache-xhrs.html = TIMEOUT
-
 // Failing since added by r108699
 BUGWK79454 WIN : svg/text/text-rescale.html = IMAGE+TEXT
 BUGWK79454 LINUX MAC : svg/text/text-rescale.html = IMAGE

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8c3b3ce..75912f6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-22  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: [Regression] xhr tests are crashing after r108506.
+        https://bugs.webkit.org/show_bug.cgi?id=79265
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::setInitialScriptContent):
+        (WebCore::InspectorResourceAgent::setInitialXHRContent):
+
 2012-02-24  Huang Dongsung  <luxtella@company100.net>
 
         Rename LocalStorageThread to StorageThread and LocalStorageTask to StorageTask.

diff --git a/Source/WebCore/inspector/InspectorResourceAgent.cpp b/Source/WebCore/inspector/InspectorResourceAgent.cpp
index 95a205a..09cdc03 100644 (file)
--- a/Source/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/Source/WebCore/inspector/InspectorResourceAgent.cpp
@@ -318,10 +318,7 @@ void InspectorResourceAgent::didLoadResourceFromMemoryCache(DocumentLoader* load
 
 void InspectorResourceAgent::setInitialScriptContent(unsigned long identifier, const String& sourceString)
 {
-    // For Asynchronous XHRs, the inspector can grab the data directly off of the CachedResource. For sync XHRs, we need to
-    // provide the data here, since no CachedResource was involved.
-    if (m_loadingXHRSynchronously)
-        m_resourcesData->setResourceContent(IdentifiersFactory::requestId(identifier), sourceString);
+    m_resourcesData->setResourceContent(IdentifiersFactory::requestId(identifier), sourceString);
 }
 
 void InspectorResourceAgent::didReceiveScriptResponse(unsigned long identifier)
@@ -331,7 +328,10 @@ void InspectorResourceAgent::didReceiveScriptResponse(unsigned long identifier)
 
 void InspectorResourceAgent::setInitialXHRContent(unsigned long identifier, const String& sourceString)
 {
-    m_resourcesData->setResourceContent(IdentifiersFactory::requestId(identifier), sourceString);
+    // For Asynchronous XHRs, the inspector can grab the data directly off of the CachedResource. For sync XHRs, we need to
+    // provide the data here, since no CachedResource was involved.
+    if (m_loadingXHRSynchronously)
+        m_resourcesData->setResourceContent(IdentifiersFactory::requestId(identifier), sourceString);
 }
 
 void InspectorResourceAgent::didReceiveXHRResponse(unsigned long identifier)