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

Unified Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 2397423003: Revert of Cache SubResourceIntegrity checks at Resource (Closed)
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 0c60d7c82f4ffdaa481ae0164d14fa3c76c96475..1647d362c10f7a3787b83946b6dbdfb9d2cb23a5 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -27,8 +27,6 @@
#include "core/fetch/CachedMetadata.h"
#include "core/fetch/CrossOriginAccessControl.h"
#include "core/fetch/FetchInitiatorTypeNames.h"
-#include "core/fetch/FetchRequest.h"
-#include "core/fetch/IntegrityMetadata.h"
#include "core/fetch/MemoryCache.h"
#include "core/fetch/ResourceClient.h"
#include "core/fetch/ResourceClientWalker.h"
@@ -315,7 +313,6 @@
m_linkPreload(false),
m_isRevalidating(false),
m_isAlive(false),
- m_integrityDisposition(ResourceIntegrityDisposition::NotChecked),
m_options(options),
m_responseTimestamp(currentTime()),
m_cancelTimer(this, &Resource::cancelTimerFired),
@@ -449,22 +446,6 @@
String ignoredErrorDescription;
return securityOrigin->canRequest(resourceRequest().url()) ||
passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
-}
-
-void Resource::setIntegrityDisposition(
- ResourceIntegrityDisposition disposition) {
- DCHECK_NE(disposition, ResourceIntegrityDisposition::NotChecked);
- DCHECK(m_type == Resource::Script);
- m_integrityDisposition = disposition;
-}
-
-bool Resource::mustRefetchDueToIntegrityMetadata(
- const FetchRequest& request) const {
- if (request.integrityMetadata().isEmpty())
- return false;
-
- return !IntegrityMetadata::setsEqual(m_integrityMetadata,
- request.integrityMetadata());
}
static double currentAge(const ResourceResponse& response,
« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.h ('k') | third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698