Changeset 87634 in webkit
- Timestamp:
- May 29, 2011 12:04:13 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87633 r87634 1 2011-05-28 Steve Falkenburg <sfalken@apple.com> 2 3 Reviewed by Dan Bernstein. 4 5 Don't add sub-frames to global history when navigating via back/forward 6 https://bugs.webkit.org/show_bug.cgi?id=61701 7 <rdar://problem/9521222> 8 9 Instead of just checking whether the load is the first in the frame, we also need to 10 check to make sure we're loading in the main frame. 11 12 Not testable due to lack of global history infrastructure in DRT. 13 14 * loader/FrameLoader.cpp: 15 (WebCore::FrameLoader::transitionToCommitted): 16 1 17 2011-05-28 Alexey Proskuryakov <ap@apple.com> 2 18 -
trunk/Source/WebCore/loader/FrameLoader.cpp
r87329 r87634 2079 2079 // without any of the items being loaded then we need to update the history in a similar manner as 2080 2080 // for a standard load with the exception of updating the back/forward list (<rdar://problem/8091103>). 2081 if (!m_stateMachine.committedFirstRealDocumentLoad() )2081 if (!m_stateMachine.committedFirstRealDocumentLoad() && isLoadingMainFrame()) 2082 2082 history()->updateForStandardLoad(HistoryController::UpdateAllExceptBackForwardList); 2083 2083
Note: See TracChangeset
for help on using the changeset viewer.