Changeset 229375 in webkit

Timestamp:

Mar 7, 2018 2:09:49 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

replaceState cause back/forward malfunction on html page with <base href="/"> tag
​https://bugs.webkit.org/show_bug.cgi?id=182678
<rdar://problem/37517821>

Patch by Sihui Liu <​sihui_liu@apple.com> on 2018-03-07
Reviewed by Chris Dumez.

Source/WebCore:

replaceState should not change URL when the URL argument is NULL, but should change URL when the URL argument is an empty string.

Test: http/tests/history/replacestate-no-url.html

• page/History.cpp:

(WebCore::History::urlForState):

LayoutTests:

• http/tests/history/replacestate-no-url-expected.txt: Added.
• http/tests/history/replacestate-no-url.html: Added.

Add layout test coverage.

• fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange-expected.txt:

Rebaseline a layout test as empty string for URL is handled differently.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/history/replacestate-no-url-expected.txt (added)
• LayoutTests/http/tests/history/replacestate-no-url.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/History.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-07  Sihui Liu  <sihui_liu@apple.com>
+
+        replaceState cause back/forward malfunction on html page with <base href="/"> tag
+        https://bugs.webkit.org/show_bug.cgi?id=182678
+        <rdar://problem/37517821>
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/history/replacestate-no-url-expected.txt: Added.
+        * http/tests/history/replacestate-no-url.html: Added.
+        Add layout test coverage.
+
+        * fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange-expected.txt:
+        Rebaseline a layout test as empty string for URL is handled differently.
+
 2018-03-07  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange-expected.txt

@@ -28 +28 @@
 State popped with event null (type object) and last path component pushstate-with-fragment-urls-and-hashchange.html#hash
 Hash change fired and last path component is pushstate-with-fragment-urls-and-hashchange.html#hash
+State popped with event null (type object) and last path component pushstate-with-fragment-urls-and-hashchange.html
+Hash change fired and last path component is pushstate-with-fragment-urls-and-hashchange.html
 State popped with event null (type object) and last path component pushstate-with-fragment-urls-and-hashchange.html#
 Hash change fired and last path component is pushstate-with-fragment-urls-and-hashchange.html#
-State popped with event null (type object) and last path component pushstate-with-fragment-urls-and-hashchange.html#
 State popped with event OriginalEntry (type string) and last path component pushstate-with-fragment-urls-and-hashchange.html
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-07  Sihui Liu  <sihui_liu@apple.com>
+
+        replaceState cause back/forward malfunction on html page with <base href="/"> tag
+        https://bugs.webkit.org/show_bug.cgi?id=182678
+        <rdar://problem/37517821>
+
+        Reviewed by Chris Dumez.
+
+        replaceState should not change URL when the URL argument is NULL, but should change URL when the URL argument is an empty string.
+
+        Test: http/tests/history/replacestate-no-url.html
+
+        * page/History.cpp:
+        (WebCore::History::urlForState):
+
 2018-03-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/page/History.cpp

@@ -157 +157 @@
 URL History::urlForState(const String& urlString)
 {
-    URL baseURL = m_frame->document()->baseURL();
-    if (urlString.isEmpty())
-        return baseURL;
-
-    return URL(baseURL, urlString);
+    if (urlString.isNull())
+        return m_frame->document()->url();
+    return m_frame->document()->completeURL(urlString);
 }