Title: [98150] branches/safari-534.52-branch
- Revision
- 98150
- Author
- lforsch...@apple.com
- Date
- 2011-10-21 14:13:53 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r97821.
Modified Paths
Added Paths
Diff
Modified: branches/safari-534.52-branch/LayoutTests/ChangeLog (98149 => 98150)
--- branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 21:10:39 UTC (rev 98149)
+++ branches/safari-534.52-branch/LayoutTests/ChangeLog 2011-10-21 21:13:53 UTC (rev 98150)
@@ -1,5 +1,20 @@
2011-10-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 97821
+
+ 2011-10-18 Anders Carlsson <ander...@apple.com>
+
+ Assertion failure when going back in page with navigated subframes
+ https://bugs.webkit.org/show_bug.cgi?id=70389
+ <rdar://problem/8988444>
+
+ Reviewed by Darin Adler.
+
+ * fast/history/history-back-twice-with-subframes-assert-expected.txt: Added.
+ * fast/history/history-back-twice-with-subframes-assert.html: Added.
+
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 95226
2011-09-15 Jon Lee <jon...@apple.com>
Copied: branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt (from rev 97821, trunk/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt) (0 => 98150)
--- branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert-expected.txt 2011-10-21 21:13:53 UTC (rev 98150)
@@ -0,0 +1,4 @@
+This tests that navigating two subframes and then going back using history.go(-2) won't assert.
+
+This tests that navigating two subframes and then going back using history.go(-2) won't assert.
+
Copied: branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html (from rev 97821, trunk/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html) (0 => 98150)
--- branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html (rev 0)
+++ branches/safari-534.52-branch/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html 2011-10-21 21:13:53 UTC (rev 98150)
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<script>
+if (layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+function runTest() {
+ var loadCount = 2;
+ var didGoBack = false;
+
+ var frame1 = document.getElementById('frame1');
+ var frame2 = document.getElementById('frame2');
+ frame1._onload_ = frame2._onload_ = function() {
+ loadCount--;
+ if (loadCount)
+ return;
+
+ if (!didGoBack) {
+ // We've navigated both frames, now go back 2 steps.
+ loadCount = 2;
+ history.go(-2);
+ didGoBack = true;
+ return;
+ }
+
+ if (layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ frame1.src = "" = '';
+}
+</script>
+<body _onload_="setTimeout(runTest, 0)">
+<div>This tests that navigating two subframes and then going back using history.go(-2) won't assert.</div>
+<iframe id='frame1' src=''></iframe>
+<iframe id='frame2' src=''></iframe>
+</body>
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98149 => 98150)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:10:39 UTC (rev 98149)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:13:53 UTC (rev 98150)
@@ -1,5 +1,31 @@
2011-10-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 97821
+
+ 2011-10-18 Anders Carlsson <ander...@apple.com>
+
+ Assertion failure when going back in page with navigated subframes
+ https://bugs.webkit.org/show_bug.cgi?id=70389
+ <rdar://problem/8988444>
+
+ Reviewed by Darin Adler.
+
+ Test: fast/history/history-back-twice-with-subframes-assert.html
+
+ If a single navigation ends up loading multiple frame, the first committed frame will
+ end up calling recursiveUpdateForCommit on the main frame which will null out the provisional item
+ for all frames on the page. This means that it can null out the provisional item for any frames
+ that are still yet to be committed which causes the aforementioned assertion failure.
+
+ Fix this by only nulling out the provisional history item (and saving/restoring the scroll position and
+ some other things) for frames that already contain the URL that the item requested. If a frame is being loaded,
+ it will null out its provisional history item when it's committed.
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::recursiveUpdateForCommit):
+
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 97433
2011-10-13 Michael Saboff <msab...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebCore/loader/HistoryController.cpp (98149 => 98150)
--- branches/safari-534.52-branch/Source/WebCore/loader/HistoryController.cpp 2011-10-21 21:10:39 UTC (rev 98149)
+++ branches/safari-534.52-branch/Source/WebCore/loader/HistoryController.cpp 2011-10-21 21:13:53 UTC (rev 98150)
@@ -471,24 +471,26 @@
// For each frame that already had the content the item requested (based on
// (a matching URL and frame tree snapshot), just restore the scroll position.
// Save form state (works from currentItem, since m_frameLoadComplete is true)
- ASSERT(m_frameLoadComplete);
- saveDocumentState();
- saveScrollPositionAndViewStateToItem(m_currentItem.get());
+ if (itemsAreClones(m_currentItem.get(), m_provisionalItem.get())) {
+ ASSERT(m_frameLoadComplete);
+ saveDocumentState();
+ saveScrollPositionAndViewStateToItem(m_currentItem.get());
- if (FrameView* view = m_frame->view())
- view->setWasScrolledByUser(false);
+ if (FrameView* view = m_frame->view())
+ view->setWasScrolledByUser(false);
- // Now commit the provisional item
- m_frameLoadComplete = false;
- m_previousItem = m_currentItem;
- m_currentItem = m_provisionalItem;
- m_provisionalItem = 0;
+ // Now commit the provisional item
+ m_frameLoadComplete = false;
+ m_previousItem = m_currentItem;
+ m_currentItem = m_provisionalItem;
+ m_provisionalItem = 0;
- // Restore form state (works from currentItem)
- restoreDocumentState();
+ // Restore form state (works from currentItem)
+ restoreDocumentState();
- // Restore the scroll position (we choose to do this rather than going back to the anchor point)
- restoreScrollPositionAndViewState();
+ // Restore the scroll position (we choose to do this rather than going back to the anchor point)
+ restoreScrollPositionAndViewState();
+ }
// Iterate over the rest of the tree
for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
