Changeset 138782 in webkit

Timestamp:

Jan 4, 2013 1:03:55 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION (r138222?): Assertion failure on appcache/main-resource-redirect.html
​https://bugs.webkit.org/show_bug.cgi?id=105591

Reviewed by Brady Eidson.

Source/WebCore:

Fixes crash in test http/tests/appcache/main-resource-redirect.html.

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::willSendRequest): In case of loading
substitute data from application cache host due to a redirect,
make sure the substitute data identifier is initialized.

LayoutTests:

Unskip http/tests/appcache/main-resource-redirect.html.

• platform/efl-wk2/TestExpectations:
• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/MainResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION (r138222?): Assertion failure on appcache/main-resource-redirect.html
+        https://bugs.webkit.org/show_bug.cgi?id=105591
+
+        Reviewed by Brady Eidson.
+
+        Unskip http/tests/appcache/main-resource-redirect.html.
+
+        * platform/efl-wk2/TestExpectations:
+        * platform/mac/TestExpectations:
+
 2013-01-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/efl-wk2/TestExpectations

@@ -59 +59 @@
 webkit.org/b/102651 [ Debug ] networkinformation/add-listener-from-callback.html [ Crash ]
 webkit.org/b/102651 [ Debug ] networkinformation/basic-operation.html [ Crash ]
-
-# ResourceClient is passed an invalid identifier value (0).
-webkit.org/b/105788 [ Debug ] http/tests/appcache/main-resource-redirect.html [ Crash ]
 
 #////////////////////////////////////////////////////////////////////////////////////////

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1257 +1257 @@
 webkit.org/b/104848 fast/frames/sandboxed-iframe-parsing-space-characters.html [ Failure Pass ]
 
-# ap is looking into this crash.
-Bug(rniwa) http/tests/appcache/main-resource-redirect.html [ Crash ]
-
 webkit.org/b/105601 svg/zoom/page/zoom-replaced-intrinsic-ratio-001.htm [ Crash Pass ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION (r138222?): Assertion failure on appcache/main-resource-redirect.html
+        https://bugs.webkit.org/show_bug.cgi?id=105591
+
+        Reviewed by Brady Eidson.
+
+        Fixes crash in test http/tests/appcache/main-resource-redirect.html.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::willSendRequest): In case of loading
+        substitute data from application cache host due to a redirect,
+        make sure the substitute data identifier is initialized.
+
 2013-01-03  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -270 +270 @@
         ASSERT(!m_substituteData.isValid());
         documentLoader()->applicationCacheHost()->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
+        if (m_substituteData.isValid())
+            m_substituteDataLoadIdentifier = identifier();
     }