| 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 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1666 } | 1666 } |
| 1667 | 1667 |
| 1668 if (!LocalDOMWindow::allowPopUp(*m_frame) && | 1668 if (!LocalDOMWindow::allowPopUp(*m_frame) && |
| 1669 !UserGestureIndicator::utilizeUserGesture()) | 1669 !UserGestureIndicator::utilizeUserGesture()) |
| 1670 return NavigationPolicyIgnore; | 1670 return NavigationPolicyIgnore; |
| 1671 client()->loadURLExternally(request, policy, String(), | 1671 client()->loadURLExternally(request, policy, String(), |
| 1672 replacesCurrentHistoryItem); | 1672 replacesCurrentHistoryItem); |
| 1673 return NavigationPolicyIgnore; | 1673 return NavigationPolicyIgnore; |
| 1674 } | 1674 } |
| 1675 | 1675 |
| 1676 void FrameLoader::clientDroppedNavigation() { |
| 1677 if (!m_provisionalDocumentLoader || m_provisionalDocumentLoader->didStart()) |
| 1678 return; |
| 1679 |
| 1680 detachDocumentLoader(m_provisionalDocumentLoader); |
| 1681 } |
| 1682 |
| 1676 NavigationPolicy FrameLoader::checkLoadCanStart( | 1683 NavigationPolicy FrameLoader::checkLoadCanStart( |
| 1677 FrameLoadRequest& frameLoadRequest, | 1684 FrameLoadRequest& frameLoadRequest, |
| 1678 FrameLoadType type, | 1685 FrameLoadType type, |
| 1679 NavigationPolicy navigationPolicy, | 1686 NavigationPolicy navigationPolicy, |
| 1680 NavigationType navigationType) { | 1687 NavigationType navigationType) { |
| 1681 if (m_frame->document()->pageDismissalEventBeingDispatched() != | 1688 if (m_frame->document()->pageDismissalEventBeingDispatched() != |
| 1682 Document::NoDismissal) { | 1689 Document::NoDismissal) { |
| 1683 return NavigationPolicyIgnore; | 1690 return NavigationPolicyIgnore; |
| 1684 } | 1691 } |
| 1685 | 1692 |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1976 frameLoadRequest.clientRedirect()); | 1983 frameLoadRequest.clientRedirect()); |
| 1977 | 1984 |
| 1978 loader->setLoadType(loadType); | 1985 loader->setLoadType(loadType); |
| 1979 loader->setNavigationType(navigationType); | 1986 loader->setNavigationType(navigationType); |
| 1980 loader->setReplacesCurrentHistoryItem(loadType == | 1987 loader->setReplacesCurrentHistoryItem(loadType == |
| 1981 FrameLoadTypeReplaceCurrentItem); | 1988 FrameLoadTypeReplaceCurrentItem); |
| 1982 return loader; | 1989 return loader; |
| 1983 } | 1990 } |
| 1984 | 1991 |
| 1985 } // namespace blink | 1992 } // namespace blink |
| OLD | NEW |