| 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 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 m_provisionalDocumentLoader->appendRedirect( | 1678 m_provisionalDocumentLoader->appendRedirect( |
| 1679 m_provisionalDocumentLoader->request().url()); | 1679 m_provisionalDocumentLoader->request().url()); |
| 1680 double triggeringEventTime = | 1680 client()->dispatchDidStartProvisionalLoad(); |
| 1681 frameLoadRequest.triggeringEvent() | |
| 1682 ? frameLoadRequest.triggeringEvent()->platformTimeStamp() | |
| 1683 : 0; | |
| 1684 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); | |
| 1685 DCHECK(m_provisionalDocumentLoader); | 1681 DCHECK(m_provisionalDocumentLoader); |
| 1686 m_provisionalDocumentLoader->startLoadingMainResource(); | 1682 m_provisionalDocumentLoader->startLoadingMainResource(); |
| 1687 | 1683 |
| 1688 takeObjectSnapshot(); | 1684 takeObjectSnapshot(); |
| 1689 } | 1685 } |
| 1690 | 1686 |
| 1691 void FrameLoader::applyUserAgent(ResourceRequest& request) { | 1687 void FrameLoader::applyUserAgent(ResourceRequest& request) { |
| 1692 String userAgent = this->userAgent(); | 1688 String userAgent = this->userAgent(); |
| 1693 DCHECK(!userAgent.isNull()); | 1689 DCHECK(!userAgent.isNull()); |
| 1694 request.setHTTPUserAgent(AtomicString(userAgent)); | 1690 request.setHTTPUserAgent(AtomicString(userAgent)); |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1927 m_documentLoader ? m_documentLoader->url() : String()); | 1923 m_documentLoader ? m_documentLoader->url() : String()); |
| 1928 return tracedValue; | 1924 return tracedValue; |
| 1929 } | 1925 } |
| 1930 | 1926 |
| 1931 inline void FrameLoader::takeObjectSnapshot() const { | 1927 inline void FrameLoader::takeObjectSnapshot() const { |
| 1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1928 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1933 toTracedValue()); | 1929 toTracedValue()); |
| 1934 } | 1930 } |
| 1935 | 1931 |
| 1936 } // namespace blink | 1932 } // namespace blink |
| OLD | NEW |