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

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

Issue 2259183002: Fix a bug in "network stable" check of FirstMeaningfulPaint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | 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) 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 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 m_context.clear(); 859 m_context.clear();
860 } 860 }
861 861
862 int ResourceFetcher::requestCount() const 862 int ResourceFetcher::requestCount() const
863 { 863 {
864 return m_loaders.size(); 864 return m_loaders.size();
865 } 865 }
866 866
867 bool ResourceFetcher::hasPendingRequest() const 867 bool ResourceFetcher::hasPendingRequest() const
868 { 868 {
869 return m_loaders.size() > 0 && m_nonBlockingLoaders.size() > 0; 869 return m_loaders.size() > 0 || m_nonBlockingLoaders.size() > 0;
870 } 870 }
871 871
872 void ResourceFetcher::preloadStarted(Resource* resource) 872 void ResourceFetcher::preloadStarted(Resource* resource)
873 { 873 {
874 if (m_preloads && m_preloads->contains(resource)) 874 if (m_preloads && m_preloads->contains(resource))
875 return; 875 return;
876 TRACE_EVENT_ASYNC_STEP_INTO0("blink.net", "Resource", resource->identifier() , "Preload"); 876 TRACE_EVENT_ASYNC_STEP_INTO0("blink.net", "Resource", resource->identifier() , "Preload");
877 resource->increasePreloadCount(); 877 resource->increasePreloadCount();
878 878
879 if (!m_preloads) 879 if (!m_preloads)
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 visitor->trace(m_context); 1319 visitor->trace(m_context);
1320 visitor->trace(m_archive); 1320 visitor->trace(m_archive);
1321 visitor->trace(m_loaders); 1321 visitor->trace(m_loaders);
1322 visitor->trace(m_nonBlockingLoaders); 1322 visitor->trace(m_nonBlockingLoaders);
1323 visitor->trace(m_documentResources); 1323 visitor->trace(m_documentResources);
1324 visitor->trace(m_preloads); 1324 visitor->trace(m_preloads);
1325 visitor->trace(m_resourceTimingInfoMap); 1325 visitor->trace(m_resourceTimingInfoMap);
1326 } 1326 }
1327 1327
1328 } // namespace blink 1328 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698