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

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

Issue 2642383003: Replace Resource::Status with ResourceStatus (Closed)
Patch Set: Rebase. Created 3 years, 11 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 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 rights reserved. 6 rights reserved.
7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
8 8
9 This library is free software; you can redistribute it and/or 9 This library is free software; you can redistribute it and/or
10 modify it under the terms of the GNU Library General Public 10 modify it under the terms of the GNU Library General Public
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // Limit the number of URLs in m_validatedURLs to avoid memory bloat. 285 // Limit the number of URLs in m_validatedURLs to avoid memory bloat.
286 // http://crbug.com/52411 286 // http://crbug.com/52411
287 static const int kMaxValidatedURLsSize = 10000; 287 static const int kMaxValidatedURLsSize = 10000;
288 288
289 void ResourceFetcher::requestLoadStarted(unsigned long identifier, 289 void ResourceFetcher::requestLoadStarted(unsigned long identifier,
290 Resource* resource, 290 Resource* resource,
291 const FetchRequest& request, 291 const FetchRequest& request,
292 ResourceLoadStartType type, 292 ResourceLoadStartType type,
293 bool isStaticData) { 293 bool isStaticData) {
294 if (type == ResourceLoadingFromCache && 294 if (type == ResourceLoadingFromCache &&
295 resource->getStatus() == Resource::Cached && 295 resource->getStatus() == ResourceStatus::Cached &&
296 !m_validatedURLs.contains(resource->url())) { 296 !m_validatedURLs.contains(resource->url())) {
297 context().dispatchDidLoadResourceFromMemoryCache( 297 context().dispatchDidLoadResourceFromMemoryCache(
298 identifier, resource, request.resourceRequest().frameType(), 298 identifier, resource, request.resourceRequest().frameType(),
299 request.resourceRequest().requestContext()); 299 request.resourceRequest().requestContext());
300 } 300 }
301 301
302 if (isStaticData) 302 if (isStaticData)
303 return; 303 return;
304 304
305 if (type == ResourceLoadingFromCache && !resource->stillNeedsLoad() && 305 if (type == ResourceLoadingFromCache && !resource->stillNeedsLoad() &&
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 visitor->trace(m_context); 1504 visitor->trace(m_context);
1505 visitor->trace(m_archive); 1505 visitor->trace(m_archive);
1506 visitor->trace(m_loaders); 1506 visitor->trace(m_loaders);
1507 visitor->trace(m_nonBlockingLoaders); 1507 visitor->trace(m_nonBlockingLoaders);
1508 visitor->trace(m_documentResources); 1508 visitor->trace(m_documentResources);
1509 visitor->trace(m_preloads); 1509 visitor->trace(m_preloads);
1510 visitor->trace(m_resourceTimingInfoMap); 1510 visitor->trace(m_resourceTimingInfoMap);
1511 } 1511 }
1512 1512
1513 } // namespace blink 1513 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/loader/fetch/Resource.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698