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 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1756 } | 1756 } |
1757 | 1757 |
1758 if (frameLoadRequest.form()) | 1758 if (frameLoadRequest.form()) |
1759 client()->dispatchWillSubmitForm(frameLoadRequest.form()); | 1759 client()->dispatchWillSubmitForm(frameLoadRequest.form()); |
1760 | 1760 |
1761 m_provisionalDocumentLoader->appendRedirect( | 1761 m_provisionalDocumentLoader->appendRedirect( |
1762 m_provisionalDocumentLoader->getRequest().url()); | 1762 m_provisionalDocumentLoader->getRequest().url()); |
1763 // TODO(ananta): | 1763 // TODO(ananta): |
1764 // We should get rid of the dependency on the DocumentLoader in consumers of | 1764 // We should get rid of the dependency on the DocumentLoader in consumers of |
1765 // the didStartProvisionalLoad() notification. | 1765 // the didStartProvisionalLoad() notification. |
1766 client()->dispatchDidStartProvisionalLoad(m_provisionalDocumentLoader); | 1766 client()->dispatchDidStartProvisionalLoad(m_provisionalDocumentLoader, |
| 1767 resourceRequest); |
1767 DCHECK(m_provisionalDocumentLoader); | 1768 DCHECK(m_provisionalDocumentLoader); |
1768 | 1769 |
1769 if (navigationPolicy == NavigationPolicyCurrentTab) { | 1770 if (navigationPolicy == NavigationPolicyCurrentTab) { |
1770 m_provisionalDocumentLoader->startLoadingMainResource(); | 1771 m_provisionalDocumentLoader->startLoadingMainResource(); |
1771 // This should happen after the request is sent, so that the state | 1772 // This should happen after the request is sent, so that the state |
1772 // the inspector stored in the matching frameScheduledClientNavigation() | 1773 // the inspector stored in the matching frameScheduledClientNavigation() |
1773 // is available while sending the request. | 1774 // is available while sending the request. |
1774 probe::frameClearedScheduledClientNavigation(m_frame); | 1775 probe::frameClearedScheduledClientNavigation(m_frame); |
1775 } else { | 1776 } else { |
1776 probe::frameScheduledClientNavigation(m_frame); | 1777 probe::frameScheduledClientNavigation(m_frame); |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1976 frameLoadRequest.clientRedirect()); | 1977 frameLoadRequest.clientRedirect()); |
1977 | 1978 |
1978 loader->setLoadType(loadType); | 1979 loader->setLoadType(loadType); |
1979 loader->setNavigationType(navigationType); | 1980 loader->setNavigationType(navigationType); |
1980 loader->setReplacesCurrentHistoryItem(loadType == | 1981 loader->setReplacesCurrentHistoryItem(loadType == |
1981 FrameLoadTypeReplaceCurrentItem); | 1982 FrameLoadTypeReplaceCurrentItem); |
1982 return loader; | 1983 return loader; |
1983 } | 1984 } |
1984 | 1985 |
1985 } // namespace blink | 1986 } // namespace blink |
OLD | NEW |