Title: [138782] trunk
- Revision
- 138782
- Author
- [email protected]
- Date
- 2013-01-04 01:03:55 -0800 (Fri, 04 Jan 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (138781 => 138782)
--- trunk/LayoutTests/ChangeLog 2013-01-04 08:29:35 UTC (rev 138781)
+++ trunk/LayoutTests/ChangeLog 2013-01-04 09:03:55 UTC (rev 138782)
@@ -1,3 +1,15 @@
+2013-01-04 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
Add one more Mac test expectation for the bug 105986.
Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (138781 => 138782)
--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2013-01-04 08:29:35 UTC (rev 138781)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2013-01-04 09:03:55 UTC (rev 138782)
@@ -59,9 +59,6 @@
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 ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# FLAKY TESTS
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/mac/TestExpectations (138781 => 138782)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-01-04 08:29:35 UTC (rev 138781)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-01-04 09:03:55 UTC (rev 138782)
@@ -1256,9 +1256,6 @@
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 ]
webkit.org/b/105603 http/tests/cookies/single-quoted-value.html [ Failure Pass ]
Modified: trunk/Source/WebCore/ChangeLog (138781 => 138782)
--- trunk/Source/WebCore/ChangeLog 2013-01-04 08:29:35 UTC (rev 138781)
+++ trunk/Source/WebCore/ChangeLog 2013-01-04 09:03:55 UTC (rev 138782)
@@ -1,3 +1,17 @@
+2013-01-04 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
incorrect flexbox relayout with overflow, padding and absolute positioning
Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (138781 => 138782)
--- trunk/Source/WebCore/loader/MainResourceLoader.cpp 2013-01-04 08:29:35 UTC (rev 138781)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp 2013-01-04 09:03:55 UTC (rev 138782)
@@ -269,6 +269,8 @@
// We checked application cache for initial URL, now we need to check it for redirected one.
ASSERT(!m_substituteData.isValid());
documentLoader()->applicationCacheHost()->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
+ if (m_substituteData.isValid())
+ m_substituteDataLoadIdentifier = identifier();
}
// FIXME: Ideally we'd stop the I/O until we hear back from the navigation policy delegate
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
