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

Side by Side Diff: third_party/WebKit/Source/platform/loader/fetch/Resource.h

Issue 2714403002: Revert of Check whether ScriptResource is still loading due to revalidation (Closed)
Patch Set: Created 3 years, 9 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) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
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 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 --m_preloadCount; 259 --m_preloadCount;
260 } 260 }
261 261
262 bool canReuseRedirectChain() const; 262 bool canReuseRedirectChain() const;
263 bool mustRevalidateDueToCacheHeaders() const; 263 bool mustRevalidateDueToCacheHeaders() const;
264 bool canUseCacheValidator() const; 264 bool canUseCacheValidator() const;
265 bool isCacheValidator() const { return m_isRevalidating; } 265 bool isCacheValidator() const { return m_isRevalidating; }
266 bool hasCacheControlNoStoreHeader() const; 266 bool hasCacheControlNoStoreHeader() const;
267 bool mustReloadDueToVaryHeader(const ResourceRequest& newRequest) const; 267 bool mustReloadDueToVaryHeader(const ResourceRequest& newRequest) const;
268 268
269 // For investigating https://crbug.com/692856.
270 bool hasRevalidated() const { return m_hasRevalidated; }
271
272 bool isEligibleForIntegrityCheck(SecurityOrigin*) const; 269 bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
273 270
274 void setIntegrityMetadata(const IntegrityMetadataSet& metadata) { 271 void setIntegrityMetadata(const IntegrityMetadataSet& metadata) {
275 m_integrityMetadata = metadata; 272 m_integrityMetadata = metadata;
276 } 273 }
277 const IntegrityMetadataSet& integrityMetadata() const { 274 const IntegrityMetadataSet& integrityMetadata() const {
278 return m_integrityMetadata; 275 return m_integrityMetadata;
279 } 276 }
280 // The argument must never be |NotChecked|. 277 // The argument must never be |NotChecked|.
281 void setIntegrityDisposition(ResourceIntegrityDisposition); 278 void setIntegrityDisposition(ResourceIntegrityDisposition);
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 452
456 String m_cacheIdentifier; 453 String m_cacheIdentifier;
457 454
458 PreloadResult m_preloadResult; 455 PreloadResult m_preloadResult;
459 Type m_type; 456 Type m_type;
460 ResourceStatus m_status; 457 ResourceStatus m_status;
461 458
462 bool m_needsSynchronousCacheHit; 459 bool m_needsSynchronousCacheHit;
463 bool m_linkPreload; 460 bool m_linkPreload;
464 bool m_isRevalidating; 461 bool m_isRevalidating;
465
466 // For investigating https://crbug.com/692856.
467 // Indicates whether at least one revalidation is done for |this|.
468 // Used for assertions only.
469 bool m_hasRevalidated = false;
470
471 bool m_isAlive; 462 bool m_isAlive;
472 bool m_isAddRemoveClientProhibited; 463 bool m_isAddRemoveClientProhibited;
473 bool m_isRevalidationStartForbidden = false; 464 bool m_isRevalidationStartForbidden = false;
474 465
475 ResourceIntegrityDisposition m_integrityDisposition; 466 ResourceIntegrityDisposition m_integrityDisposition;
476 IntegrityMetadataSet m_integrityMetadata; 467 IntegrityMetadataSet m_integrityMetadata;
477 468
478 // Ordered list of all redirects followed while fetching this resource. 469 // Ordered list of all redirects followed while fetching this resource.
479 Vector<RedirectPair> m_redirectChain; 470 Vector<RedirectPair> m_redirectChain;
480 471
(...skipping 30 matching lines...) Expand all
511 }; 502 };
512 503
513 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \ 504 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
514 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, \ 505 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, \
515 resource->getType() == Resource::typeName, \ 506 resource->getType() == Resource::typeName, \
516 resource.getType() == Resource::typeName); 507 resource.getType() == Resource::typeName);
517 508
518 } // namespace blink 509 } // namespace blink
519 510
520 #endif 511 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698