| 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 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1771 // the provisional loader and save navigation state in it. We want to | 1771 // the provisional loader and save navigation state in it. We want to |
| 1772 // avoid | 1772 // avoid |
| 1773 // this dependency on the provisional loader. For now we create a | 1773 // this dependency on the provisional loader. For now we create a |
| 1774 // temporary | 1774 // temporary |
| 1775 // loader and pass it to the didStartProvisionalLoad() function. | 1775 // loader and pass it to the didStartProvisionalLoad() function. |
| 1776 // TODO(ananta) | 1776 // TODO(ananta) |
| 1777 // We should get rid of the dependency on the DocumentLoader in | 1777 // We should get rid of the dependency on the DocumentLoader in |
| 1778 // consumers | 1778 // consumers |
| 1779 // of | 1779 // of |
| 1780 // the didStartProvisionalLoad() notification. | 1780 // the didStartProvisionalLoad() notification. |
| 1781 client()->dispatchDidStartProvisionalLoad(loader); | 1781 client()->dispatchDidStartProvisionalLoad(loader, &resourceRequest); |
| 1782 DCHECK(loader); | 1782 DCHECK(loader); |
| 1783 loader->setSentDidFinishLoad(); | 1783 loader->setSentDidFinishLoad(); |
| 1784 loader->detachFromFrame(); | 1784 loader->detachFromFrame(); |
| 1785 } | 1785 } |
| 1786 } | 1786 } |
| 1787 return; | 1787 return; |
| 1788 } | 1788 } |
| 1789 | 1789 |
| 1790 m_provisionalDocumentLoader = createDocumentLoader( | 1790 m_provisionalDocumentLoader = createDocumentLoader( |
| 1791 resourceRequest, frameLoadRequest, type, navigationType); | 1791 resourceRequest, frameLoadRequest, type, navigationType); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 1807 if (!m_isNavigationHandledByClient) | 1807 if (!m_isNavigationHandledByClient) |
| 1808 m_progressTracker->progressStarted(type); | 1808 m_progressTracker->progressStarted(type); |
| 1809 else | 1809 else |
| 1810 m_isNavigationHandledByClient = false; | 1810 m_isNavigationHandledByClient = false; |
| 1811 | 1811 |
| 1812 m_provisionalDocumentLoader->appendRedirect( | 1812 m_provisionalDocumentLoader->appendRedirect( |
| 1813 m_provisionalDocumentLoader->getRequest().url()); | 1813 m_provisionalDocumentLoader->getRequest().url()); |
| 1814 // TODO(ananta) | 1814 // TODO(ananta) |
| 1815 // We should get rid of the dependency on the DocumentLoader in consumers of | 1815 // We should get rid of the dependency on the DocumentLoader in consumers of |
| 1816 // the didStartProvisionalLoad() notification. | 1816 // the didStartProvisionalLoad() notification. |
| 1817 client()->dispatchDidStartProvisionalLoad(m_provisionalDocumentLoader); | 1817 client()->dispatchDidStartProvisionalLoad(m_provisionalDocumentLoader, |
| 1818 &resourceRequest); |
| 1818 DCHECK(m_provisionalDocumentLoader); | 1819 DCHECK(m_provisionalDocumentLoader); |
| 1819 | 1820 |
| 1820 m_provisionalDocumentLoader->startLoadingMainResource(); | 1821 m_provisionalDocumentLoader->startLoadingMainResource(); |
| 1821 | 1822 |
| 1822 // This should happen after the request is sent, so we don't use | 1823 // This should happen after the request is sent, so we don't use |
| 1823 // clearNavigationHandledByClient() above. | 1824 // clearNavigationHandledByClient() above. |
| 1824 if (isNavigationHandledByClient) | 1825 if (isNavigationHandledByClient) |
| 1825 probe::frameClearedScheduledClientNavigation(m_frame); | 1826 probe::frameClearedScheduledClientNavigation(m_frame); |
| 1826 | 1827 |
| 1827 takeObjectSnapshot(); | 1828 takeObjectSnapshot(); |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2034 m_isNavigationHandledByClient = true; | 2035 m_isNavigationHandledByClient = true; |
| 2035 probe::frameScheduledClientNavigation(m_frame); | 2036 probe::frameScheduledClientNavigation(m_frame); |
| 2036 } | 2037 } |
| 2037 | 2038 |
| 2038 void FrameLoader::clearNavigationHandledByClient() { | 2039 void FrameLoader::clearNavigationHandledByClient() { |
| 2039 m_isNavigationHandledByClient = false; | 2040 m_isNavigationHandledByClient = false; |
| 2040 probe::frameClearedScheduledClientNavigation(m_frame); | 2041 probe::frameClearedScheduledClientNavigation(m_frame); |
| 2041 } | 2042 } |
| 2042 | 2043 |
| 2043 } // namespace blink | 2044 } // namespace blink |
| OLD | NEW |