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

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

Issue 2768813002: PlzNavigate: don't stop all loaders when renderer-initiated nav fails
Patch Set: Removed id 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 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1583 } 1583 }
1584 1584
1585 if (!LocalDOMWindow::allowPopUp(*m_frame) && 1585 if (!LocalDOMWindow::allowPopUp(*m_frame) &&
1586 !UserGestureIndicator::utilizeUserGesture()) 1586 !UserGestureIndicator::utilizeUserGesture())
1587 return NavigationPolicyIgnore; 1587 return NavigationPolicyIgnore;
1588 client()->loadURLExternally(request, policy, String(), 1588 client()->loadURLExternally(request, policy, String(),
1589 replacesCurrentHistoryItem); 1589 replacesCurrentHistoryItem);
1590 return NavigationPolicyIgnore; 1590 return NavigationPolicyIgnore;
1591 } 1591 }
1592 1592
1593 void FrameLoader::clientDroppedNavigation() {
1594 if (!m_provisionalDocumentLoader || m_provisionalDocumentLoader->didStart())
1595 return;
1596
1597 detachDocumentLoader(m_provisionalDocumentLoader);
1598 }
1599
1593 NavigationPolicy FrameLoader::checkLoadCanStart( 1600 NavigationPolicy FrameLoader::checkLoadCanStart(
1594 FrameLoadRequest& frameLoadRequest, 1601 FrameLoadRequest& frameLoadRequest,
1595 FrameLoadType type, 1602 FrameLoadType type,
1596 NavigationPolicy navigationPolicy, 1603 NavigationPolicy navigationPolicy,
1597 NavigationType navigationType) { 1604 NavigationType navigationType) {
1598 if (m_frame->document()->pageDismissalEventBeingDispatched() != 1605 if (m_frame->document()->pageDismissalEventBeingDispatched() !=
1599 Document::NoDismissal) { 1606 Document::NoDismissal) {
1600 return NavigationPolicyIgnore; 1607 return NavigationPolicyIgnore;
1601 } 1608 }
1602 1609
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1902 frameLoadRequest.clientRedirect()); 1909 frameLoadRequest.clientRedirect());
1903 1910
1904 loader->setLoadType(loadType); 1911 loader->setLoadType(loadType);
1905 loader->setNavigationType(navigationType); 1912 loader->setNavigationType(navigationType);
1906 loader->setReplacesCurrentHistoryItem(loadType == 1913 loader->setReplacesCurrentHistoryItem(loadType ==
1907 FrameLoadTypeReplaceCurrentItem); 1914 FrameLoadTypeReplaceCurrentItem);
1908 return loader; 1915 return loader;
1909 } 1916 }
1910 1917
1911 } // namespace blink 1918 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698