Attachment 180851 Details for Bug 105591 – Different approach

[patch] Different approach

wcore-loader-id.diff (text/plain), 3.96 KB, created by Carlos Garcia Campos on 2012-12-28 01:00:34 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2012-12-28 01:00:34 PST

Size: 3.96 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 94eb3d3..2812e38 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-12-28  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 NOBODY (OOPS!).
>+
>+        Unskip http/tests/appcache/main-resource-redirect.html.
>+
>+        * platform/efl-wk2/TestExpectations:
>+        * platform/mac/TestExpectations:
>+
> 2012-12-28  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
> 
>         Unreviewed holiday gardening, skip new failing tests to paint the bots green.
>diff --git a/LayoutTests/platform/efl-wk2/TestExpectations b/LayoutTests/platform/efl-wk2/TestExpectations
>index 7558761..67de34f 100644
>--- a/LayoutTests/platform/efl-wk2/TestExpectations
>+++ b/LayoutTests/platform/efl-wk2/TestExpectations
>@@ -59,9 +59,6 @@ webkit.org/b/102651 [ Debug ] networkinformation/updates.html [ Crash ]
> 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
> #////////////////////////////////////////////////////////////////////////////////////////
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index f3019f8..3fd07f0 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1273,9 +1273,6 @@ webkit.org/b/105567 http/tests/security/data-url-inline.css.html [ Crash Pass ]
> webkit.org/b/104848 fast/frames/sandboxed-iframe-attribute-parsing.html [ Failure Pass ]
> 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 ]
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d5a2aab..1e2f2b2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-12-28  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 NOBODY (OOPS!).
>+
>+        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.
>+
> 2012-12-27  Dimitri Glazkov  <dglazkov@chromium.org>
> 
>         Fix styling/formatting errors, pointed out by Darin Adler while reviewing
>diff --git a/Source/WebCore/loader/MainResourceLoader.cpp b/Source/WebCore/loader/MainResourceLoader.cpp
>index 350eb0d..9e0611e 100644
>--- a/Source/WebCore/loader/MainResourceLoader.cpp
>+++ b/Source/WebCore/loader/MainResourceLoader.cpp
>@@ -269,6 +269,8 @@ void MainResourceLoader::willSendRequest(ResourceRequest& newRequest, const Reso
>         // 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

Flags:

beidson: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 105591: 180537 | 180851