| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 visitor->trace(m_frame); | 205 visitor->trace(m_frame); |
| 206 visitor->trace(m_progressTracker); | 206 visitor->trace(m_progressTracker); |
| 207 visitor->trace(m_documentLoader); | 207 visitor->trace(m_documentLoader); |
| 208 visitor->trace(m_provisionalDocumentLoader); | 208 visitor->trace(m_provisionalDocumentLoader); |
| 209 visitor->trace(m_currentItem); | 209 visitor->trace(m_currentItem); |
| 210 visitor->trace(m_provisionalItem); | 210 visitor->trace(m_provisionalItem); |
| 211 visitor->trace(m_deferredHistoryLoad); | 211 visitor->trace(m_deferredHistoryLoad); |
| 212 } | 212 } |
| 213 | 213 |
| 214 void FrameLoader::init() { | 214 void FrameLoader::init() { |
| 215 ResourceRequest initialRequest(KURL(ParsedURLString, emptyString())); | 215 ResourceRequest initialRequest(KURL(ParsedURLString, emptyString)); |
| 216 initialRequest.setRequestContext(WebURLRequest::RequestContextInternal); | 216 initialRequest.setRequestContext(WebURLRequest::RequestContextInternal); |
| 217 initialRequest.setFrameType(m_frame->isMainFrame() | 217 initialRequest.setFrameType(m_frame->isMainFrame() |
| 218 ? WebURLRequest::FrameTypeTopLevel | 218 ? WebURLRequest::FrameTypeTopLevel |
| 219 : WebURLRequest::FrameTypeNested); | 219 : WebURLRequest::FrameTypeNested); |
| 220 m_provisionalDocumentLoader = | 220 m_provisionalDocumentLoader = |
| 221 client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(), | 221 client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(), |
| 222 ClientRedirectPolicy::NotClientRedirect); | 222 ClientRedirectPolicy::NotClientRedirect); |
| 223 m_provisionalDocumentLoader->startLoadingMainResource(); | 223 m_provisionalDocumentLoader->startLoadingMainResource(); |
| 224 m_frame->document()->cancelParsing(); | 224 m_frame->document()->cancelParsing(); |
| 225 m_stateMachine.advanceTo( | 225 m_stateMachine.advanceTo( |
| (...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1955 m_documentLoader ? m_documentLoader->url() : String()); | 1955 m_documentLoader ? m_documentLoader->url() : String()); |
| 1956 return tracedValue; | 1956 return tracedValue; |
| 1957 } | 1957 } |
| 1958 | 1958 |
| 1959 inline void FrameLoader::takeObjectSnapshot() const { | 1959 inline void FrameLoader::takeObjectSnapshot() const { |
| 1960 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1960 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1961 toTracedValue()); | 1961 toTracedValue()); |
| 1962 } | 1962 } |
| 1963 | 1963 |
| 1964 } // namespace blink | 1964 } // namespace blink |
| OLD | NEW |