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

Side by Side Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 252383010: Call DOMWindow::finishedLoading from FrameLoader::checkLoadCompleteForThisFrame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/loader/DocumentLoader.h » ('j') | 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 context().dispatchDidDownloadData(m_documentLoader, resource->identifier(), dataLength, encodedDataLength); 1252 context().dispatchDidDownloadData(m_documentLoader, resource->identifier(), dataLength, encodedDataLength);
1253 } 1253 }
1254 1254
1255 void ResourceFetcher::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* lo ader) 1255 void ResourceFetcher::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* lo ader)
1256 { 1256 {
1257 if (!m_multipartLoaders) 1257 if (!m_multipartLoaders)
1258 m_multipartLoaders = adoptPtr(new ResourceLoaderSet()); 1258 m_multipartLoaders = adoptPtr(new ResourceLoaderSet());
1259 m_multipartLoaders->add(loader); 1259 m_multipartLoaders->add(loader);
1260 m_loaders->remove(loader); 1260 m_loaders->remove(loader);
1261 if (LocalFrame* frame = this->frame()) 1261 if (LocalFrame* frame = this->frame())
1262 return frame->loader().checkLoadComplete(m_documentLoader); 1262 return frame->loader().checkLoadComplete();
1263 } 1263 }
1264 1264
1265 void ResourceFetcher::didInitializeResourceLoader(ResourceLoader* loader) 1265 void ResourceFetcher::didInitializeResourceLoader(ResourceLoader* loader)
1266 { 1266 {
1267 if (!m_document) 1267 if (!m_document)
1268 return; 1268 return;
1269 if (!m_loaders) 1269 if (!m_loaders)
1270 m_loaders = adoptPtr(new ResourceLoaderSet()); 1270 m_loaders = adoptPtr(new ResourceLoaderSet());
1271 ASSERT(!m_loaders->contains(loader)); 1271 ASSERT(!m_loaders->contains(loader));
1272 m_loaders->add(loader); 1272 m_loaders->add(loader);
1273 } 1273 }
1274 1274
1275 void ResourceFetcher::willTerminateResourceLoader(ResourceLoader* loader) 1275 void ResourceFetcher::willTerminateResourceLoader(ResourceLoader* loader)
1276 { 1276 {
1277 if (m_loaders && m_loaders->contains(loader)) 1277 if (m_loaders && m_loaders->contains(loader))
1278 m_loaders->remove(loader); 1278 m_loaders->remove(loader);
1279 if (m_multipartLoaders && m_multipartLoaders->contains(loader)) 1279 if (m_multipartLoaders && m_multipartLoaders->contains(loader))
1280 m_multipartLoaders->remove(loader); 1280 m_multipartLoaders->remove(loader);
1281 if (LocalFrame* frame = this->frame()) 1281 if (LocalFrame* frame = this->frame())
1282 frame->loader().checkLoadComplete(m_documentLoader); 1282 frame->loader().checkLoadComplete();
1283 } 1283 }
1284 1284
1285 void ResourceFetcher::willStartLoadingResource(ResourceRequest& request) 1285 void ResourceFetcher::willStartLoadingResource(ResourceRequest& request)
1286 { 1286 {
1287 if (m_documentLoader) 1287 if (m_documentLoader)
1288 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque st); 1288 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque st);
1289 } 1289 }
1290 1290
1291 void ResourceFetcher::stopFetching() 1291 void ResourceFetcher::stopFetching()
1292 { 1292 {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 case Revalidate: 1435 case Revalidate:
1436 ++m_revalidateCount; 1436 ++m_revalidateCount;
1437 return; 1437 return;
1438 case Use: 1438 case Use:
1439 ++m_useCount; 1439 ++m_useCount;
1440 return; 1440 return;
1441 } 1441 }
1442 } 1442 }
1443 1443
1444 } 1444 }
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/loader/DocumentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698