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

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

Issue 2735183003: PlzNavigate: stop navigations when opening a document for write (Closed)
Patch Set: Rebase Created 3 years, 9 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
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 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after
1670 } 1670 }
1671 1671
1672 if (!LocalDOMWindow::allowPopUp(*m_frame) && 1672 if (!LocalDOMWindow::allowPopUp(*m_frame) &&
1673 !UserGestureIndicator::utilizeUserGesture()) 1673 !UserGestureIndicator::utilizeUserGesture())
1674 return NavigationPolicyIgnore; 1674 return NavigationPolicyIgnore;
1675 client()->loadURLExternally(request, policy, String(), 1675 client()->loadURLExternally(request, policy, String(),
1676 replacesCurrentHistoryItem); 1676 replacesCurrentHistoryItem);
1677 return NavigationPolicyIgnore; 1677 return NavigationPolicyIgnore;
1678 } 1678 }
1679 1679
1680 void FrameLoader::clientDroppedNavigation() {
1681 if (!m_provisionalDocumentLoader || m_provisionalDocumentLoader->didStart())
1682 return;
1683
1684 detachDocumentLoader(m_provisionalDocumentLoader);
1685 }
1686
1680 NavigationPolicy FrameLoader::checkLoadCanStart( 1687 NavigationPolicy FrameLoader::checkLoadCanStart(
1681 FrameLoadRequest& frameLoadRequest, 1688 FrameLoadRequest& frameLoadRequest,
1682 FrameLoadType type, 1689 FrameLoadType type,
1683 NavigationPolicy navigationPolicy, 1690 NavigationPolicy navigationPolicy,
1684 NavigationType navigationType) { 1691 NavigationType navigationType) {
1685 if (m_frame->document()->pageDismissalEventBeingDispatched() != 1692 if (m_frame->document()->pageDismissalEventBeingDispatched() !=
1686 Document::NoDismissal) { 1693 Document::NoDismissal) {
1687 return NavigationPolicyIgnore; 1694 return NavigationPolicyIgnore;
1688 } 1695 }
1689 1696
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1981 frameLoadRequest.clientRedirect()); 1988 frameLoadRequest.clientRedirect());
1982 1989
1983 loader->setLoadType(loadType); 1990 loader->setLoadType(loadType);
1984 loader->setNavigationType(navigationType); 1991 loader->setNavigationType(navigationType);
1985 loader->setReplacesCurrentHistoryItem(loadType == 1992 loader->setReplacesCurrentHistoryItem(loadType ==
1986 FrameLoadTypeReplaceCurrentItem); 1993 FrameLoadTypeReplaceCurrentItem);
1987 return loader; 1994 return loader;
1988 } 1995 }
1989 1996
1990 } // namespace blink 1997 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698