Chromium Code Reviews| 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 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1668 | 1668 |
| 1669 m_frame->navigationScheduler().cancel(); | 1669 m_frame->navigationScheduler().cancel(); |
| 1670 m_checkTimer.stop(); | 1670 m_checkTimer.stop(); |
| 1671 | 1671 |
| 1672 m_loadType = type; | 1672 m_loadType = type; |
| 1673 | 1673 |
| 1674 if (frameLoadRequest.form()) | 1674 if (frameLoadRequest.form()) |
| 1675 client()->dispatchWillSubmitForm(frameLoadRequest.form()); | 1675 client()->dispatchWillSubmitForm(frameLoadRequest.form()); |
| 1676 | 1676 |
| 1677 m_progressTracker->progressStarted(); | 1677 m_progressTracker->progressStarted(); |
| 1678 // The document URL needs to be added to the head of the list as that is | |
| 1679 // where the redirects originated. | |
| 1678 if (m_provisionalDocumentLoader->isClientRedirect()) | 1680 if (m_provisionalDocumentLoader->isClientRedirect()) |
| 1679 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); | 1681 m_provisionalDocumentLoader->prependRedirect(m_frame->document()->url()); |
|
nasko
2016/10/31 18:45:50
Why is there another URL in the redirect chain? Th
ananta
2016/10/31 19:11:33
The FrameLoaderClientImpl::createDocumentLoader fu
| |
| 1680 m_provisionalDocumentLoader->appendRedirect( | 1682 m_provisionalDocumentLoader->appendRedirect( |
| 1681 m_provisionalDocumentLoader->request().url()); | 1683 m_provisionalDocumentLoader->request().url()); |
| 1682 double triggeringEventTime = | 1684 double triggeringEventTime = |
| 1683 frameLoadRequest.triggeringEvent() | 1685 frameLoadRequest.triggeringEvent() |
| 1684 ? frameLoadRequest.triggeringEvent()->platformTimeStamp() | 1686 ? frameLoadRequest.triggeringEvent()->platformTimeStamp() |
| 1685 : 0; | 1687 : 0; |
| 1686 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); | 1688 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); |
| 1687 DCHECK(m_provisionalDocumentLoader); | 1689 DCHECK(m_provisionalDocumentLoader); |
| 1688 m_provisionalDocumentLoader->startLoadingMainResource(); | 1690 m_provisionalDocumentLoader->startLoadingMainResource(); |
| 1689 | 1691 |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1929 m_documentLoader ? m_documentLoader->url() : String()); | 1931 m_documentLoader ? m_documentLoader->url() : String()); |
| 1930 return tracedValue; | 1932 return tracedValue; |
| 1931 } | 1933 } |
| 1932 | 1934 |
| 1933 inline void FrameLoader::takeObjectSnapshot() const { | 1935 inline void FrameLoader::takeObjectSnapshot() const { |
| 1934 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1936 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1935 toTracedValue()); | 1937 toTracedValue()); |
| 1936 } | 1938 } |
| 1937 | 1939 |
| 1938 } // namespace blink | 1940 } // namespace blink |
| OLD | NEW |