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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2600653002: PlzNavigate: cancel any scheduled navigations when deciding to let the embedder handle a navigation. (Closed)
Patch Set: . Created 3 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
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation ('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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 isClientRedirect, form); 1628 isClientRedirect, form);
1629 if (policy == NavigationPolicyCurrentTab) 1629 if (policy == NavigationPolicyCurrentTab)
1630 return true; 1630 return true;
1631 if (policy == NavigationPolicyIgnore) 1631 if (policy == NavigationPolicyIgnore)
1632 return false; 1632 return false;
1633 if (policy == NavigationPolicyHandledByClient) { 1633 if (policy == NavigationPolicyHandledByClient) {
1634 m_isNavigationHandledByClient = true; 1634 m_isNavigationHandledByClient = true;
1635 // Mark the frame as loading since the embedder is handling the navigation. 1635 // Mark the frame as loading since the embedder is handling the navigation.
1636 m_progressTracker->progressStarted(); 1636 m_progressTracker->progressStarted();
1637 1637
1638 m_frame->navigationScheduler().cancel();
1639
1638 // If this is a form submit, dispatch that a form is being submitted 1640 // If this is a form submit, dispatch that a form is being submitted
1639 // since the embedder is handling the navigation. 1641 // since the embedder is handling the navigation.
1640 if (form) 1642 if (form)
1641 client()->dispatchWillSubmitForm(form); 1643 client()->dispatchWillSubmitForm(form);
1642 1644
1643 return false; 1645 return false;
1644 } 1646 }
1645 if (!LocalDOMWindow::allowPopUp(*m_frame) && 1647 if (!LocalDOMWindow::allowPopUp(*m_frame) &&
1646 !UserGestureIndicator::utilizeUserGesture()) 1648 !UserGestureIndicator::utilizeUserGesture())
1647 return false; 1649 return false;
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1892 m_documentLoader ? m_documentLoader->url() : String()); 1894 m_documentLoader ? m_documentLoader->url() : String());
1893 return tracedValue; 1895 return tracedValue;
1894 } 1896 }
1895 1897
1896 inline void FrameLoader::takeObjectSnapshot() const { 1898 inline void FrameLoader::takeObjectSnapshot() const {
1897 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1899 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1898 toTracedValue()); 1900 toTracedValue());
1899 } 1901 }
1900 1902
1901 } // namespace blink 1903 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698