Title: [228984] trunk
Revision
228984
Author
[email protected]
Date
2018-02-25 18:50:31 -0800 (Sun, 25 Feb 2018)

Log Message

[WK2] http/tests/navigation/new-window-redirect-history.html crashes
https://bugs.webkit.org/show_bug.cgi?id=127683

Patch by Fujii Hironori <[email protected]> on 2018-02-25
Reviewed by Dan Bernstein.

Tools:

m_previousTestBackForwardListItem was null for the new window.
m_previousTestBackForwardListItem is initialized only for the main
window in InjectedBundlePage::prepare.

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::dumpBackForwardList):
Do null-check of m_previousTestBackForwardListItem.

LayoutTests:

* platform/ios-wk2/TestExpectations:
Unmarked http/tests/navigation/new-window-redirect-history.html.
* platform/wk2/TestExpectations: Ditto.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (228983 => 228984)


--- trunk/LayoutTests/ChangeLog	2018-02-26 02:18:24 UTC (rev 228983)
+++ trunk/LayoutTests/ChangeLog	2018-02-26 02:50:31 UTC (rev 228984)
@@ -1,3 +1,14 @@
+2018-02-25  Fujii Hironori  <[email protected]>
+
+        [WK2] http/tests/navigation/new-window-redirect-history.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=127683
+
+        Reviewed by Dan Bernstein.
+
+        * platform/ios-wk2/TestExpectations:
+        Unmarked http/tests/navigation/new-window-redirect-history.html.
+        * platform/wk2/TestExpectations: Ditto.
+
 2018-02-22  Antoine Quint  <[email protected]>
 
         REGRESSION (r228445): A big pause button shows over YouTube videos if you tap "Tap To Unmute" on iOS

Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (228983 => 228984)


--- trunk/LayoutTests/platform/ios-wk2/TestExpectations	2018-02-26 02:18:24 UTC (rev 228983)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations	2018-02-26 02:50:31 UTC (rev 228984)
@@ -335,7 +335,6 @@
 http/tests/uri/css-href.php [ Failure ]
 
 # HTTP tests that assert:
-http/tests/navigation/new-window-redirect-history.html
 http/tests/plugins/plugin-document-has-focus.html
 http/tests/security/inactive-document-with-empty-security-origin.html
 http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html

Modified: trunk/LayoutTests/platform/wk2/TestExpectations (228983 => 228984)


--- trunk/LayoutTests/platform/wk2/TestExpectations	2018-02-26 02:18:24 UTC (rev 228983)
+++ trunk/LayoutTests/platform/wk2/TestExpectations	2018-02-26 02:50:31 UTC (rev 228984)
@@ -163,8 +163,6 @@
 
 webkit.org/b/105952 fast/loader/submit-form-while-parsing-2.html [ Pass Failure ]
 
-webkit.org/b/127683 http/tests/navigation/new-window-redirect-history.html [ Skip ]
-
 # Causes next test to crash only on WebKit2
 webkit.org/b/98345 fast/parser/document-open-in-unload.html [ Skip ]
 

Modified: trunk/Tools/ChangeLog (228983 => 228984)


--- trunk/Tools/ChangeLog	2018-02-26 02:18:24 UTC (rev 228983)
+++ trunk/Tools/ChangeLog	2018-02-26 02:50:31 UTC (rev 228984)
@@ -1,3 +1,18 @@
+2018-02-25  Fujii Hironori  <[email protected]>
+
+        [WK2] http/tests/navigation/new-window-redirect-history.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=127683
+
+        Reviewed by Dan Bernstein.
+
+        m_previousTestBackForwardListItem was null for the new window.
+        m_previousTestBackForwardListItem is initialized only for the main
+        window in InjectedBundlePage::prepare.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::dumpBackForwardList):
+        Do null-check of m_previousTestBackForwardListItem.
+
 2018-02-25  Alexey Proskuryakov  <[email protected]>
 
         Various crashes in WebKitTestRunner, especially when system is under heavy load

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (228983 => 228984)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2018-02-26 02:18:24 UTC (rev 228983)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2018-02-26 02:50:31 UTC (rev 228984)
@@ -1978,11 +1978,11 @@
     for (unsigned i = WKBundleBackForwardListGetForwardListCount(list); i; --i) {
         WKRetainPtr<WKBundleBackForwardListItemRef> item = adoptWK(WKBundleBackForwardListCopyItemAtIndex(list, i));
         // Something is wrong if the item from the last test is in the forward part of the list.
-        ASSERT(!WKBundleBackForwardListItemIsSame(item.get(), m_previousTestBackForwardListItem.get()));
+        ASSERT(!m_previousTestBackForwardListItem || !WKBundleBackForwardListItemIsSame(item.get(), m_previousTestBackForwardListItem.get()));
         itemsToPrint.append(item);
     }
 
-    ASSERT(!WKBundleBackForwardListItemIsSame(adoptWK(WKBundleBackForwardListCopyItemAtIndex(list, 0)).get(), m_previousTestBackForwardListItem.get()));
+    ASSERT(!m_previousTestBackForwardListItem || !WKBundleBackForwardListItemIsSame(adoptWK(WKBundleBackForwardListCopyItemAtIndex(list, 0)).get(), m_previousTestBackForwardListItem.get()));
 
     itemsToPrint.append(adoptWK(WKBundleBackForwardListCopyItemAtIndex(list, 0)));
 
@@ -1991,7 +1991,7 @@
     int backListCount = WKBundleBackForwardListGetBackListCount(list);
     for (int i = -1; i >= -backListCount; --i) {
         WKRetainPtr<WKBundleBackForwardListItemRef> item = adoptWK(WKBundleBackForwardListCopyItemAtIndex(list, i));
-        if (WKBundleBackForwardListItemIsSame(item.get(), m_previousTestBackForwardListItem.get()))
+        if (m_previousTestBackForwardListItem && WKBundleBackForwardListItemIsSame(item.get(), m_previousTestBackForwardListItem.get()))
             break;
         itemsToPrint.append(item);
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to