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 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1647 m_frame->owner()->dispatchLoad(); | 1647 m_frame->owner()->dispatchLoad(); |
1648 return NavigationPolicyIgnore; | 1648 return NavigationPolicyIgnore; |
1649 } | 1649 } |
1650 } | 1650 } |
1651 } | 1651 } |
1652 | 1652 |
1653 bool isFormSubmission = type == NavigationTypeFormSubmitted || | 1653 bool isFormSubmission = type == NavigationTypeFormSubmitted || |
1654 type == NavigationTypeFormResubmitted; | 1654 type == NavigationTypeFormResubmitted; |
1655 if (isFormSubmission && | 1655 if (isFormSubmission && |
1656 !m_frame->document()->contentSecurityPolicy()->allowFormAction( | 1656 !m_frame->document()->contentSecurityPolicy()->allowFormAction( |
1657 request.url())) | 1657 request.url(), request.redirectStatus())) { |
1658 return NavigationPolicyIgnore; | 1658 return NavigationPolicyIgnore; |
| 1659 } |
1659 | 1660 |
1660 bool replacesCurrentHistoryItem = | 1661 bool replacesCurrentHistoryItem = |
1661 frameLoadType == FrameLoadTypeReplaceCurrentItem; | 1662 frameLoadType == FrameLoadTypeReplaceCurrentItem; |
1662 policy = client()->decidePolicyForNavigation(request, loader, type, policy, | 1663 policy = client()->decidePolicyForNavigation(request, loader, type, policy, |
1663 replacesCurrentHistoryItem, | 1664 replacesCurrentHistoryItem, |
1664 isClientRedirect, form); | 1665 isClientRedirect, form); |
1665 if (policy == NavigationPolicyCurrentTab || | 1666 if (policy == NavigationPolicyCurrentTab || |
1666 policy == NavigationPolicyIgnore || | 1667 policy == NavigationPolicyIgnore || |
1667 policy == NavigationPolicyHandledByClient || | 1668 policy == NavigationPolicyHandledByClient || |
1668 policy == NavigationPolicyHandledByClientForInitialHistory) { | 1669 policy == NavigationPolicyHandledByClientForInitialHistory) { |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1981 frameLoadRequest.clientRedirect()); | 1982 frameLoadRequest.clientRedirect()); |
1982 | 1983 |
1983 loader->setLoadType(loadType); | 1984 loader->setLoadType(loadType); |
1984 loader->setNavigationType(navigationType); | 1985 loader->setNavigationType(navigationType); |
1985 loader->setReplacesCurrentHistoryItem(loadType == | 1986 loader->setReplacesCurrentHistoryItem(loadType == |
1986 FrameLoadTypeReplaceCurrentItem); | 1987 FrameLoadTypeReplaceCurrentItem); |
1987 return loader; | 1988 return loader; |
1988 } | 1989 } |
1989 | 1990 |
1990 } // namespace blink | 1991 } // namespace blink |
OLD | NEW |