Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2545023002: Clean up around FrameFetchContext (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 m_progressTracker(ProgressTracker::create(frame)), 186 m_progressTracker(ProgressTracker::create(frame)),
187 m_loadType(FrameLoadTypeStandard), 187 m_loadType(FrameLoadTypeStandard),
188 m_inStopAllLoaders(false), 188 m_inStopAllLoaders(false),
189 m_checkTimer(TaskRunnerHelper::get(TaskType::Networking, frame), 189 m_checkTimer(TaskRunnerHelper::get(TaskType::Networking, frame),
190 this, 190 this,
191 &FrameLoader::checkTimerFired), 191 &FrameLoader::checkTimerFired),
192 m_forcedSandboxFlags(SandboxNone), 192 m_forcedSandboxFlags(SandboxNone),
193 m_dispatchingDidClearWindowObjectInMainWorld(false), 193 m_dispatchingDidClearWindowObjectInMainWorld(false),
194 m_protectProvisionalLoader(false), 194 m_protectProvisionalLoader(false),
195 m_isNavigationHandledByClient(false) { 195 m_isNavigationHandledByClient(false) {
196 DCHECK(m_frame);
196 TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this); 197 TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this);
197 takeObjectSnapshot(); 198 takeObjectSnapshot();
198 } 199 }
199 200
200 FrameLoader::~FrameLoader() { 201 FrameLoader::~FrameLoader() {
201 // Verify that this FrameLoader has been detached. 202 // Verify that this FrameLoader has been detached.
202 DCHECK(!m_progressTracker); 203 DCHECK(!m_progressTracker);
203 } 204 }
204 205
205 DEFINE_TRACE(FrameLoader) { 206 DEFINE_TRACE(FrameLoader) {
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 m_documentLoader ? m_documentLoader->url() : String()); 1959 m_documentLoader ? m_documentLoader->url() : String());
1959 return tracedValue; 1960 return tracedValue;
1960 } 1961 }
1961 1962
1962 inline void FrameLoader::takeObjectSnapshot() const { 1963 inline void FrameLoader::takeObjectSnapshot() const {
1963 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1964 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1964 toTracedValue()); 1965 toTracedValue());
1965 } 1966 }
1966 1967
1967 } // namespace blink 1968 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698