Title: [87634] trunk/Source/WebCore
- Revision
- 87634
- Author
- [email protected]
- Date
- 2011-05-29 00:04:13 -0700 (Sun, 29 May 2011)
Log Message
2011-05-28 Steve Falkenburg <[email protected]>
Reviewed by Dan Bernstein.
Don't add sub-frames to global history when navigating via back/forward
https://bugs.webkit.org/show_bug.cgi?id=61701
<rdar://problem/9521222>
Instead of just checking whether the load is the first in the frame, we also need to
check to make sure we're loading in the main frame.
Not testable due to lack of global history infrastructure in DRT.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::transitionToCommitted):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87633 => 87634)
--- trunk/Source/WebCore/ChangeLog 2011-05-29 04:42:18 UTC (rev 87633)
+++ trunk/Source/WebCore/ChangeLog 2011-05-29 07:04:13 UTC (rev 87634)
@@ -1,3 +1,19 @@
+2011-05-28 Steve Falkenburg <[email protected]>
+
+ Reviewed by Dan Bernstein.
+
+ Don't add sub-frames to global history when navigating via back/forward
+ https://bugs.webkit.org/show_bug.cgi?id=61701
+ <rdar://problem/9521222>
+
+ Instead of just checking whether the load is the first in the frame, we also need to
+ check to make sure we're loading in the main frame.
+
+ Not testable due to lack of global history infrastructure in DRT.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::transitionToCommitted):
+
2011-05-28 Alexey Proskuryakov <[email protected]>
Suggested by Simon Fraser.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (87633 => 87634)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-05-29 04:42:18 UTC (rev 87633)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-05-29 07:04:13 UTC (rev 87634)
@@ -2078,7 +2078,7 @@
// If the first load within a frame is a navigation within a back/forward list that was attached
// without any of the items being loaded then we need to update the history in a similar manner as
// for a standard load with the exception of updating the back/forward list (<rdar://problem/8091103>).
- if (!m_stateMachine.committedFirstRealDocumentLoad())
+ if (!m_stateMachine.committedFirstRealDocumentLoad() && isLoadingMainFrame())
history()->updateForStandardLoad(HistoryController::UpdateAllExceptBackForwardList);
history()->updateForBackForwardNavigation();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
