Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(696)

Side by Side Diff: Source/web/FrameLoaderClientImpl.cpp

Issue 139103003: Reland "Remove children from HistoryNodes that redirect during back/forward navigation" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Make trybots happy Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/HistoryController.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 void FrameLoaderClientImpl::dispatchDidHandleOnloadEvents() 316 void FrameLoaderClientImpl::dispatchDidHandleOnloadEvents()
317 { 317 {
318 if (m_webFrame->client()) 318 if (m_webFrame->client())
319 m_webFrame->client()->didHandleOnloadEvents(m_webFrame); 319 m_webFrame->client()->didHandleOnloadEvents(m_webFrame);
320 } 320 }
321 321
322 void FrameLoaderClientImpl::dispatchDidReceiveServerRedirectForProvisionalLoad() 322 void FrameLoaderClientImpl::dispatchDidReceiveServerRedirectForProvisionalLoad()
323 { 323 {
324 if (m_webFrame->client()) 324 if (m_webFrame->client())
325 m_webFrame->client()->didReceiveServerRedirectForProvisionalLoad(m_webFr ame); 325 m_webFrame->client()->didReceiveServerRedirectForProvisionalLoad(m_webFr ame);
326 m_webFrame->frame()->page()->historyController().removeChildrenForRedirect(m _webFrame->frame());
326 } 327 }
327 328
328 void FrameLoaderClientImpl::dispatchDidNavigateWithinPage(HistoryItem* item, His toryCommitType commitType) 329 void FrameLoaderClientImpl::dispatchDidNavigateWithinPage(HistoryItem* item, His toryCommitType commitType)
329 { 330 {
330 bool shouldCreateHistoryEntry = commitType == StandardCommit; 331 bool shouldCreateHistoryEntry = commitType == StandardCommit;
331 if (shouldCreateHistoryEntry) 332 if (shouldCreateHistoryEntry)
332 m_webFrame->frame()->page()->historyController().updateBackForwardListFo rFragmentScroll(m_webFrame->frame(), item); 333 m_webFrame->frame()->page()->historyController().updateBackForwardListFo rFragmentScroll(m_webFrame->frame(), item);
333 m_webFrame->viewImpl()->didCommitLoad(shouldCreateHistoryEntry, true); 334 m_webFrame->viewImpl()->didCommitLoad(shouldCreateHistoryEntry, true);
334 if (m_webFrame->client()) 335 if (m_webFrame->client())
335 m_webFrame->client()->didNavigateWithinPage(m_webFrame, shouldCreateHist oryEntry); 336 m_webFrame->client()->didNavigateWithinPage(m_webFrame, shouldCreateHist oryEntry);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 return m_webFrame->sharedWorkerRepositoryClient(); 752 return m_webFrame->sharedWorkerRepositoryClient();
752 } 753 }
753 754
754 void FrameLoaderClientImpl::didStopAllLoaders() 755 void FrameLoaderClientImpl::didStopAllLoaders()
755 { 756 {
756 if (m_webFrame->client()) 757 if (m_webFrame->client())
757 m_webFrame->client()->didAbortLoading(m_webFrame); 758 m_webFrame->client()->didAbortLoading(m_webFrame);
758 } 759 }
759 760
760 } // namespace blink 761 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/HistoryController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698