Changeset 87634 in webkit

Timestamp:

May 29, 2011 12:04:13 AM (13 years ago)

Author:

sfalken@apple.com

Message:

2011-05-28 Steve Falkenburg <​sfalken@apple.com>

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-28  Steve Falkenburg  <sfalken@apple.com>
+
+        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  <ap@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2079 +2079 @@
                 // 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);