Index: third_party/WebKit/Source/core/fetch/Resource.h |
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h |
index 365fd3f0c777f971d9a13edbc842717b558f00cd..acc142bf961cf53bc93bc6af0fce71e08f48a2fb 100644 |
--- a/third_party/WebKit/Source/core/fetch/Resource.h |
+++ b/third_party/WebKit/Source/core/fetch/Resource.h |
@@ -26,7 +26,6 @@ |
#include "core/CoreExport.h" |
#include "core/fetch/CachedMetadataHandler.h" |
-#include "core/fetch/IntegrityMetadata.h" |
#include "core/fetch/ResourceLoaderOptions.h" |
#include "platform/MemoryCoordinator.h" |
#include "platform/SharedBuffer.h" |
@@ -195,6 +194,8 @@ |
bool passesAccessControlCheck(SecurityOrigin*, |
String& errorDescription) const; |
+ bool isEligibleForIntegrityCheck(SecurityOrigin*) const; |
+ |
virtual PassRefPtr<const SharedBuffer> resourceBuffer() const { |
return m_data; |
} |
@@ -252,21 +253,10 @@ |
bool isCacheValidator() const { return m_isRevalidating; } |
bool hasCacheControlNoStoreHeader() const; |
bool hasVaryHeader() const; |
- |
- bool isEligibleForIntegrityCheck(SecurityOrigin*) const; |
- |
- void setIntegrityMetadata(const IntegrityMetadataSet& metadata) { |
- m_integrityMetadata = metadata; |
- } |
- const IntegrityMetadataSet& integrityMetadata() const { |
- return m_integrityMetadata; |
- } |
- // The argument must never be |NotChecked|. |
- void setIntegrityDisposition(ResourceIntegrityDisposition); |
- ResourceIntegrityDisposition integrityDisposition() const { |
- return m_integrityDisposition; |
- } |
- bool mustRefetchDueToIntegrityMetadata(const FetchRequest&) const; |
+ virtual bool mustRefetchDueToIntegrityMetadata( |
+ const FetchRequest& request) const { |
+ return false; |
+ } |
double currentAge() const; |
double freshnessLifetime(); |
@@ -417,9 +407,6 @@ |
bool m_isRevalidating : 1; |
bool m_isAlive : 1; |
- ResourceIntegrityDisposition m_integrityDisposition; |
- IntegrityMetadataSet m_integrityMetadata; |
- |
// Ordered list of all redirects followed while fetching this resource. |
Vector<RedirectPair> m_redirectChain; |