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

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

Issue 2191533003: Refactor Timer classes in preparation for landing FrameTimers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android build fix Created 4 years, 4 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 } 162 }
163 request.setSkipServiceWorker(frameLoadType == FrameLoadTypeReloadBypassingCa che ? WebURLRequest::SkipServiceWorker::All : WebURLRequest::SkipServiceWorker:: None); 163 request.setSkipServiceWorker(frameLoadType == FrameLoadTypeReloadBypassingCa che ? WebURLRequest::SkipServiceWorker::All : WebURLRequest::SkipServiceWorker:: None);
164 return request; 164 return request;
165 } 165 }
166 166
167 FrameLoader::FrameLoader(LocalFrame* frame) 167 FrameLoader::FrameLoader(LocalFrame* frame)
168 : m_frame(frame) 168 : m_frame(frame)
169 , m_progressTracker(ProgressTracker::create(frame)) 169 , m_progressTracker(ProgressTracker::create(frame))
170 , m_loadType(FrameLoadTypeStandard) 170 , m_loadType(FrameLoadTypeStandard)
171 , m_inStopAllLoaders(false) 171 , m_inStopAllLoaders(false)
172 , m_checkTimer(this, &FrameLoader::checkTimerFired, TaskRunnerHelper::getLoa dingTaskRunner(frame)) 172 , m_checkTimer(TaskRunnerHelper::getLoadingTaskRunner(frame), this, &FrameLo ader::checkTimerFired)
173 , m_didAccessInitialDocument(false) 173 , m_didAccessInitialDocument(false)
174 , m_forcedSandboxFlags(SandboxNone) 174 , m_forcedSandboxFlags(SandboxNone)
175 , m_dispatchingDidClearWindowObjectInMainWorld(false) 175 , m_dispatchingDidClearWindowObjectInMainWorld(false)
176 , m_protectProvisionalLoader(false) 176 , m_protectProvisionalLoader(false)
177 { 177 {
178 TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this); 178 TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this);
179 takeObjectSnapshot(); 179 takeObjectSnapshot();
180 } 180 }
181 181
182 FrameLoader::~FrameLoader() 182 FrameLoader::~FrameLoader()
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 654
655 m_loadType = FrameLoadTypeStandard; 655 m_loadType = FrameLoadTypeStandard;
656 m_frame->localDOMWindow()->finishedLoading(); 656 m_frame->localDOMWindow()->finishedLoading();
657 } 657 }
658 658
659 Frame* parent = m_frame->tree().parent(); 659 Frame* parent = m_frame->tree().parent();
660 if (parent && parent->isLocalFrame()) 660 if (parent && parent->isLocalFrame())
661 toLocalFrame(parent)->loader().checkCompleted(); 661 toLocalFrame(parent)->loader().checkCompleted();
662 } 662 }
663 663
664 void FrameLoader::checkTimerFired(Timer<FrameLoader>*) 664 void FrameLoader::checkTimerFired(TimerBase*)
665 { 665 {
666 if (Page* page = m_frame->page()) { 666 if (Page* page = m_frame->page()) {
667 if (page->defersLoading()) 667 if (page->defersLoading())
668 return; 668 return;
669 } 669 }
670 checkCompleted(); 670 checkCompleted();
671 } 671 }
672 672
673 void FrameLoader::scheduleCheckCompleted() 673 void FrameLoader::scheduleCheckCompleted()
674 { 674 {
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1611 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1612 return tracedValue; 1612 return tracedValue;
1613 } 1613 }
1614 1614
1615 inline void FrameLoader::takeObjectSnapshot() const 1615 inline void FrameLoader::takeObjectSnapshot() const
1616 { 1616 {
1617 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1617 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1618 } 1618 }
1619 1619
1620 } // namespace blink 1620 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698