| 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 1601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1612 | 1612 |
| 1613 bool isFormSubmission = type == NavigationTypeFormSubmitted || | 1613 bool isFormSubmission = type == NavigationTypeFormSubmitted || |
| 1614 type == NavigationTypeFormResubmitted; | 1614 type == NavigationTypeFormResubmitted; |
| 1615 if (isFormSubmission && | 1615 if (isFormSubmission && |
| 1616 !m_frame->document()->contentSecurityPolicy()->allowFormAction( | 1616 !m_frame->document()->contentSecurityPolicy()->allowFormAction( |
| 1617 request.url())) | 1617 request.url())) |
| 1618 return false; | 1618 return false; |
| 1619 | 1619 |
| 1620 policy = client()->decidePolicyForNavigation(request, loader, type, policy, | 1620 policy = client()->decidePolicyForNavigation(request, loader, type, policy, |
| 1621 replacesCurrentHistoryItem, | 1621 replacesCurrentHistoryItem, |
| 1622 isClientRedirect); | 1622 isClientRedirect, form); |
| 1623 if (policy == NavigationPolicyCurrentTab) | 1623 if (policy == NavigationPolicyCurrentTab) |
| 1624 return true; | 1624 return true; |
| 1625 if (policy == NavigationPolicyIgnore) | 1625 if (policy == NavigationPolicyIgnore) |
| 1626 return false; | 1626 return false; |
| 1627 if (policy == NavigationPolicyHandledByClient) { | 1627 if (policy == NavigationPolicyHandledByClient) { |
| 1628 m_isNavigationHandledByClient = true; | 1628 m_isNavigationHandledByClient = true; |
| 1629 // Mark the frame as loading since the embedder is handling the navigation. | 1629 // Mark the frame as loading since the embedder is handling the navigation. |
| 1630 m_progressTracker->progressStarted(); | 1630 m_progressTracker->progressStarted(); |
| 1631 | 1631 |
| 1632 // If this is a form submit, dispatch that a form is being submitted | 1632 // If this is a form submit, dispatch that a form is being submitted |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1952 m_documentLoader ? m_documentLoader->url() : String()); | 1952 m_documentLoader ? m_documentLoader->url() : String()); |
| 1953 return tracedValue; | 1953 return tracedValue; |
| 1954 } | 1954 } |
| 1955 | 1955 |
| 1956 inline void FrameLoader::takeObjectSnapshot() const { | 1956 inline void FrameLoader::takeObjectSnapshot() const { |
| 1957 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1957 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1958 toTracedValue()); | 1958 toTracedValue()); |
| 1959 } | 1959 } |
| 1960 | 1960 |
| 1961 } // namespace blink | 1961 } // namespace blink |
| OLD | NEW |