Attachment 343701 Details for Bug 98345 – Patch

[patch] Patch

bug-98345-20180627013120.patch (text/plain), 3.27 KB, created by Fujii Hironori on 2018-06-27 01:31:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-06-27 01:31:40 PDT

Size: 3.27 KB

patch

obsolete

>Subversion Revision: 233246
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d14476f37f595cb8edaff91c7323e8a6d48be31a..f201878e7d4bab6db217fb184015af8262f914ab 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WK2] fast/parser/document-open-in-unload.html makes the following test crash
>+        https://bugs.webkit.org/show_bug.cgi?id=98345
>+        <rdar://problem/12474923>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        m_documentLoader can become null in the middle of
>+        FrameLoader::commitProvisionalLoad by stopping the loading.
>+
>+        No new tests (Covered by existing tests).
>+
>+        * loader/FrameLoader.cpp:
>+        (WebCore::FrameLoader::commitProvisionalLoad): Do null check of m_documentLoader.
>+
> 2018-06-26  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [JSC] Pass VM& to functions more
>diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
>index 4ee524631672df923543cd4245ea68e011b0f3f1..77d7a22a55884bd25d6bd5d0d2557f2a7986cd0d 100644
>--- a/Source/WebCore/loader/FrameLoader.cpp
>+++ b/Source/WebCore/loader/FrameLoader.cpp
>@@ -2010,7 +2010,9 @@ void FrameLoader::commitProvisionalLoad()
>     LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame.tree().uniqueName().string().utf8().data(),
>         m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "");
> 
>-    if (m_loadType == FrameLoadType::Standard && m_documentLoader->isClientRedirect())
>+    if (m_loadType == FrameLoadType::Standard
>+        && m_documentLoader // m_documentLoader can become null by detaching the frame.
>+        && m_documentLoader->isClientRedirect())
>         history().updateForClientRedirect();
> 
>     if (m_loadingFromCachedPage) {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 0ef9b8a7f1a2390350a04e18c779249929c361ee..5ccee88ff3ba7d038397d3e0e120ca92af7c8953 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WK2] fast/parser/document-open-in-unload.html makes the following test crash
>+        https://bugs.webkit.org/show_bug.cgi?id=98345
>+        <rdar://problem/12474923>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/wk2/TestExpectations: Unskipped fast/parser/document-open-in-unload.html.
>+
> 2018-06-26  Youenn Fablet  <youenn@apple.com>
> 
>         Import wpt CORP tests
>diff --git a/LayoutTests/platform/wk2/TestExpectations b/LayoutTests/platform/wk2/TestExpectations
>index ef20d396424924d40be6cd2e8ad83dea6df19327..5a312bf075bff6a7f1312e045067dd4264382054 100644
>--- a/LayoutTests/platform/wk2/TestExpectations
>+++ b/LayoutTests/platform/wk2/TestExpectations
>@@ -157,9 +157,6 @@ plugins/npruntime/embed-property-iframe-equality.html
> 
> webkit.org/b/105952 fast/loader/submit-form-while-parsing-2.html [ Pass Failure ]
> 
>-# Causes next test to crash only on WebKit2
>-webkit.org/b/98345 fast/parser/document-open-in-unload.html [ Skip ]
>-
> webkit.org/b/141122 editing/selection/programmatic-selection-on-mac-is-directionless.html [ Pass Failure ]
> 
> webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-cancel.html [ Pass Failure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 98345: 343575 | 343577 | 343579 | 343584 | 343585 | 343701 | 343899 | 344067