Title: [108749] trunk
- Revision
- 108749
- Author
- [email protected]
- Date
- 2012-02-24 01:31:07 -0800 (Fri, 24 Feb 2012)
Log Message
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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (108748 => 108749)
--- trunk/LayoutTests/ChangeLog 2012-02-24 08:55:59 UTC (rev 108748)
+++ trunk/LayoutTests/ChangeLog 2012-02-24 09:31:07 UTC (rev 108749)
@@ -1,3 +1,12 @@
+2012-02-22 Vsevolod Vlasov <[email protected]>
+
+ 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 <[email protected]>
`\u200c` and `\u200d` should be allowed in IdentifierPart, as per ES5
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (108748 => 108749)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-24 08:55:59 UTC (rev 108748)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-24 09:31:07 UTC (rev 108749)
@@ -4212,12 +4212,6 @@
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
Modified: trunk/Source/WebCore/ChangeLog (108748 => 108749)
--- trunk/Source/WebCore/ChangeLog 2012-02-24 08:55:59 UTC (rev 108748)
+++ trunk/Source/WebCore/ChangeLog 2012-02-24 09:31:07 UTC (rev 108749)
@@ -1,3 +1,14 @@
+2012-02-22 Vsevolod Vlasov <[email protected]>
+
+ 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 <[email protected]>
Rename LocalStorageThread to StorageThread and LocalStorageTask to StorageTask.
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (108748 => 108749)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2012-02-24 08:55:59 UTC (rev 108748)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2012-02-24 09:31:07 UTC (rev 108749)
@@ -318,10 +318,7 @@
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::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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
