| OLD | NEW |
| 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 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1711 } | 1711 } |
| 1712 | 1712 |
| 1713 if (!LocalDOMWindow::allowPopUp(*m_frame) && | 1713 if (!LocalDOMWindow::allowPopUp(*m_frame) && |
| 1714 !UserGestureIndicator::utilizeUserGesture()) | 1714 !UserGestureIndicator::utilizeUserGesture()) |
| 1715 return NavigationPolicyIgnore; | 1715 return NavigationPolicyIgnore; |
| 1716 client()->loadURLExternally(request, policy, String(), | 1716 client()->loadURLExternally(request, policy, String(), |
| 1717 replacesCurrentHistoryItem); | 1717 replacesCurrentHistoryItem); |
| 1718 return NavigationPolicyIgnore; | 1718 return NavigationPolicyIgnore; |
| 1719 } | 1719 } |
| 1720 | 1720 |
| 1721 void FrameLoader::clientDroppedNavigation() { |
| 1722 if (!m_provisionalDocumentLoader || m_provisionalDocumentLoader->didStart()) |
| 1723 return; |
| 1724 |
| 1725 detachDocumentLoader(m_provisionalDocumentLoader); |
| 1726 } |
| 1727 |
| 1721 NavigationPolicy FrameLoader::checkLoadCanStart( | 1728 NavigationPolicy FrameLoader::checkLoadCanStart( |
| 1722 FrameLoadRequest& frameLoadRequest, | 1729 FrameLoadRequest& frameLoadRequest, |
| 1723 FrameLoadType type, | 1730 FrameLoadType type, |
| 1724 NavigationPolicy navigationPolicy, | 1731 NavigationPolicy navigationPolicy, |
| 1725 NavigationType navigationType) { | 1732 NavigationType navigationType) { |
| 1726 if (m_frame->document()->pageDismissalEventBeingDispatched() != | 1733 if (m_frame->document()->pageDismissalEventBeingDispatched() != |
| 1727 Document::NoDismissal) { | 1734 Document::NoDismissal) { |
| 1728 return NavigationPolicyIgnore; | 1735 return NavigationPolicyIgnore; |
| 1729 } | 1736 } |
| 1730 | 1737 |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2028 frameLoadRequest.clientRedirect()); | 2035 frameLoadRequest.clientRedirect()); |
| 2029 | 2036 |
| 2030 loader->setLoadType(loadType); | 2037 loader->setLoadType(loadType); |
| 2031 loader->setNavigationType(navigationType); | 2038 loader->setNavigationType(navigationType); |
| 2032 loader->setReplacesCurrentHistoryItem(loadType == | 2039 loader->setReplacesCurrentHistoryItem(loadType == |
| 2033 FrameLoadTypeReplaceCurrentItem); | 2040 FrameLoadTypeReplaceCurrentItem); |
| 2034 return loader; | 2041 return loader; |
| 2035 } | 2042 } |
| 2036 | 2043 |
| 2037 } // namespace blink | 2044 } // namespace blink |
| OLD | NEW |