Changeset 82843 in webkit

Timestamp:

Apr 4, 2011 10:05:55 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-04 Yong Li <​yoli@rim.com>

Reviewed by Antonio Gomes.

​https://bugs.webkit.org/show_bug.cgi?id=55969
Add a test that verifies history scroll position is restored
when WebKit goes forward from an unreachable URL error page.
(Error page handling is only supported by Qt DRT.)

• platform/qt/fast/history/back-to-unreachable-url-then-forward-expected.txt: Added.
• platform/qt/fast/history/back-to-unreachable-url-then-forward.html: Added.
• platform/qt/fast/history/resources/check-scroll-position.html: Added.

2011-04-04 Yong Li <​yoli@rim.com>

Reviewed by Antonio Gomes.

​https://bugs.webkit.org/show_bug.cgi?id=55969
Fix the issue that document state is not saved when
going backward and ending up with error page.

Test: platform/qt/fast/history/back-to-unreachable-url-then-forward.html

(For manual test, load a non-existent html first, then load
fast/history/resources/check-scroll-position.html, then go
back and go forward. If it doesn't show "SUCCESS" at the bottom
of the page, your browser has failed the test)

• loader/FrameLoader.cpp: (WebCore::FrameLoader::load):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/fast/history/back-to-unreachable-url-then-forward-expected.txt (added)
• LayoutTests/platform/qt/fast/history/back-to-unreachable-url-then-forward.html (added)
• LayoutTests/platform/qt/fast/history/resources (added)
• LayoutTests/platform/qt/fast/history/resources/check-scroll-position.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-04  Yong Li  <yoli@rim.com>
+
+        Reviewed by Antonio Gomes.
+
+        https://bugs.webkit.org/show_bug.cgi?id=55969
+        Add a test that verifies history scroll position is restored
+        when WebKit goes forward from an unreachable URL error page.
+        (Error page handling is only supported by Qt DRT.)
+
+        * platform/qt/fast/history/back-to-unreachable-url-then-forward-expected.txt: Added.
+        * platform/qt/fast/history/back-to-unreachable-url-then-forward.html: Added.
+        * platform/qt/fast/history/resources/check-scroll-position.html: Added.
+
 2011-04-04  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-04  Yong Li  <yoli@rim.com>
+
+        Reviewed by Antonio Gomes.
+
+        https://bugs.webkit.org/show_bug.cgi?id=55969
+        Fix the issue that document state is not saved when
+        going backward and ending up with error page.
+
+        Test: platform/qt/fast/history/back-to-unreachable-url-then-forward.html
+
+        (For manual test, load a non-existent html first, then load
+        fast/history/resources/check-scroll-position.html, then go
+        back and go forward. If it doesn't show "SUCCESS" at the bottom
+        of the page, your browser has failed the test)
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::load):
+
 2011-04-04  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1467 +1467 @@
     // "load without affecting history" ? 
     if (shouldReloadToHandleUnreachableURL(newDocumentLoader)) {
+        // shouldReloadToHandleUnreachableURL() returns true only when the original load type is back-forward.
+        // In this case we should save the document state now. Otherwise the state can be lost because load type is
+        // changed and updateForBackForwardNavigation() will not be called when loading is committed.
+        history()->saveDocumentAndScrollState();
+
         ASSERT(type == FrameLoadTypeStandard);
         type = FrameLoadTypeReload;