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

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

Issue 2332333003: Make internals.isPreloaded() to remain the same before/after clearPreloads() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reflect comments Created 4 years, 3 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) 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 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 void ResourceFetcher::preloadStarted(Resource* resource) 866 void ResourceFetcher::preloadStarted(Resource* resource)
867 { 867 {
868 if (m_preloads && m_preloads->contains(resource)) 868 if (m_preloads && m_preloads->contains(resource))
869 return; 869 return;
870 TRACE_EVENT_ASYNC_STEP_INTO0("blink.net", "Resource", resource->identifier() , "Preload"); 870 TRACE_EVENT_ASYNC_STEP_INTO0("blink.net", "Resource", resource->identifier() , "Preload");
871 resource->increasePreloadCount(); 871 resource->increasePreloadCount();
872 872
873 if (!m_preloads) 873 if (!m_preloads)
874 m_preloads = new HeapListHashSet<Member<Resource>>; 874 m_preloads = new HeapListHashSet<Member<Resource>>;
875 m_preloads->add(resource); 875 m_preloads->add(resource);
876
877 if (m_preloadedURLsForTest)
878 m_preloadedURLsForTest->add(resource->url().getString());
876 } 879 }
877 880
878 bool ResourceFetcher::isPreloaded(const KURL& url) const 881 void ResourceFetcher::enableIsPreloadedForTest()
879 { 882 {
883 if (m_preloadedURLsForTest)
884 return;
885 m_preloadedURLsForTest = wrapUnique(new HashSet<String>);
886
880 if (m_preloads) { 887 if (m_preloads) {
881 for (auto resource : *m_preloads) { 888 for (auto resource : *m_preloads)
Yoav Weiss 2016/09/15 08:34:31 nit: const auto& (I changed all other m_preloads
hiroshige 2016/09/15 08:39:11 Done.
882 if (resource->url() == url) 889 m_preloadedURLsForTest->add(resource->url().getString());
883 return true;
884 }
885 } 890 }
891 }
886 892
887 return false; 893 bool ResourceFetcher::isPreloadedForTest(const KURL& url) const
894 {
895 DCHECK(m_preloadedURLsForTest);
896 return m_preloadedURLsForTest->contains(url.getString());
888 } 897 }
889 898
890 void ResourceFetcher::clearPreloads(ClearPreloadsPolicy policy) 899 void ResourceFetcher::clearPreloads(ClearPreloadsPolicy policy)
891 { 900 {
892 if (!m_preloads) 901 if (!m_preloads)
893 return; 902 return;
894 903
895 logPreloadStats(); 904 logPreloadStats();
896 905
897 for (auto resource : *m_preloads) { 906 for (auto resource : *m_preloads) {
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 visitor->trace(m_context); 1333 visitor->trace(m_context);
1325 visitor->trace(m_archive); 1334 visitor->trace(m_archive);
1326 visitor->trace(m_loaders); 1335 visitor->trace(m_loaders);
1327 visitor->trace(m_nonBlockingLoaders); 1336 visitor->trace(m_nonBlockingLoaders);
1328 visitor->trace(m_documentResources); 1337 visitor->trace(m_documentResources);
1329 visitor->trace(m_preloads); 1338 visitor->trace(m_preloads);
1330 visitor->trace(m_resourceTimingInfoMap); 1339 visitor->trace(m_resourceTimingInfoMap);
1331 } 1340 }
1332 1341
1333 } // namespace blink 1342 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.h ('k') | third_party/WebKit/Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698