Title: [107859] trunk
Revision
107859
Author
[email protected]
Date
2012-02-15 17:19:28 -0800 (Wed, 15 Feb 2012)

Log Message

Source/WebCore: Fix test regressons from r107672.
https://bugs.webkit.org/show_bug.cgi?id=76564

Move setting CachedRawResource::m_identifer from
data() to setResponse(). WorkerScriptLoader depends
on the identifier being set correctly during setResponse()
in order to correctly mark itself as a ScriptResource in
the inspector.

Reviewed by Adam Barth.

Fixes several worker script loading tests.

* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::data):
(WebCore::CachedRawResource::setResponse):

LayoutTests: Remove Skipped tests that were broken by r107672.
https://bugs.webkit.org/show_bug.cgi?id=76564

Reviewed by Adam Barth.

* platform/gtk/Skipped:
* platform/qt/Skipped:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (107858 => 107859)


--- trunk/LayoutTests/ChangeLog	2012-02-16 01:06:44 UTC (rev 107858)
+++ trunk/LayoutTests/ChangeLog	2012-02-16 01:19:28 UTC (rev 107859)
@@ -1,3 +1,13 @@
+2012-02-15  Nate Chapin  <[email protected]>
+
+        Remove Skipped tests that were broken by r107672.
+        https://bugs.webkit.org/show_bug.cgi?id=76564
+
+        Reviewed by Adam Barth.
+
+        * platform/gtk/Skipped:
+        * platform/qt/Skipped:
+
 2012-02-15  Tony Chang  <[email protected]>
 
         [chromium] Unreviewed.  regionOverflow tests are flaky in debug.

Modified: trunk/LayoutTests/platform/gtk/Skipped (107858 => 107859)


--- trunk/LayoutTests/platform/gtk/Skipped	2012-02-16 01:06:44 UTC (rev 107858)
+++ trunk/LayoutTests/platform/gtk/Skipped	2012-02-16 01:19:28 UTC (rev 107859)
@@ -1618,10 +1618,6 @@
 fast/mutation/end-of-task-delivery.html
 fast/mutation/inline-event-listener.html
 
-# Let MemoryCache reuse cached XHRs (REGRESSION caused by r107672)
-# https://bugs.webkit.org/show_bug.cgi?id=76564
-fast/workers/worker-crash-with-invalid-location.html
-
 # Replace old strtod with new strtod (REGRESSION caused by r107625)
 # https://bugs.webkit.org/show_bug.cgi?id=68044
 fast/viewport/viewport-67.html

Modified: trunk/LayoutTests/platform/qt/Skipped (107858 => 107859)


--- trunk/LayoutTests/platform/qt/Skipped	2012-02-16 01:06:44 UTC (rev 107858)
+++ trunk/LayoutTests/platform/qt/Skipped	2012-02-16 01:19:28 UTC (rev 107859)
@@ -2608,12 +2608,8 @@
 fast/events/pageshow-pagehide-on-back-cached.html
 fast/events/pageshow-pagehide-on-back-cached-with-frames.html
 
-# Let MemoryCache reuse cached XHRs (REGRESSION caused by r107672)
-# https://bugs.webkit.org/show_bug.cgi?id=76564
-fast/workers/worker-crash-with-invalid-location.html
+# Fails on most platforms, probably failing due to an earlier test.
 http/tests/inspector/inspect-element.html
-http/tests/inspector/network/network-shared-worker.html
-http/tests/inspector/network/network-worker.html
 
 # Replace old strtod with new strtod (REGRESSION caused by r107625)
 # https://bugs.webkit.org/show_bug.cgi?id=68044

Modified: trunk/Source/WebCore/ChangeLog (107858 => 107859)


--- trunk/Source/WebCore/ChangeLog	2012-02-16 01:06:44 UTC (rev 107858)
+++ trunk/Source/WebCore/ChangeLog	2012-02-16 01:19:28 UTC (rev 107859)
@@ -1,3 +1,22 @@
+2012-02-15  Nate Chapin  <[email protected]>
+
+        Fix test regressons from r107672.
+        https://bugs.webkit.org/show_bug.cgi?id=76564
+
+        Move setting CachedRawResource::m_identifer from
+        data() to setResponse(). WorkerScriptLoader depends
+        on the identifier being set correctly during setResponse()
+        in order to correctly mark itself as a ScriptResource in
+        the inspector.
+
+        Reviewed by Adam Barth.
+
+        Fixes several worker script loading tests.
+
+        * loader/cache/CachedRawResource.cpp:
+        (WebCore::CachedRawResource::data):
+        (WebCore::CachedRawResource::setResponse):
+
 2012-02-15  Enrica Casucci  <[email protected]>
 
         REGRESSION: "Copy image" fails...copies image URL instead.

Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (107858 => 107859)


--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp	2012-02-16 01:06:44 UTC (rev 107858)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp	2012-02-16 01:19:28 UTC (rev 107859)
@@ -44,9 +44,6 @@
 void CachedRawResource::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
 {
     CachedResourceHandle<CachedRawResource> protect(this);
-    if (!m_identifier)
-        m_identifier = m_loader->identifier();
-
     if (data) {
         // If we are buffering data, then we are saving the buffer in m_data and need to manually
         // calculate the incremental data. If we are not buffering, then m_data will be null and
@@ -160,6 +157,8 @@
 
 void CachedRawResource::setResponse(const ResourceResponse& response)
 {
+    if (!m_identifier)
+        m_identifier = m_loader->identifier();
     CachedResource::setResponse(response);
     CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
     while (CachedRawResourceClient* c = w.next())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to