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

Unified Diff: third_party/WebKit/Source/core/frame/SubresourceIntegrity.cpp

Issue 2723793002: De-Element ScriptLoader (Closed)
Patch Set: De-Element ScriptLoader Created 3 years, 10 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/frame/SubresourceIntegrity.cpp
diff --git a/third_party/WebKit/Source/core/frame/SubresourceIntegrity.cpp b/third_party/WebKit/Source/core/frame/SubresourceIntegrity.cpp
index a0d9454923b756e49da00a226ac225c966616227..f7653a1995e804173cf635c3faac99f863054413 100644
--- a/third_party/WebKit/Source/core/frame/SubresourceIntegrity.cpp
+++ b/third_party/WebKit/Source/core/frame/SubresourceIntegrity.cpp
@@ -101,13 +101,12 @@ HashAlgorithm SubresourceIntegrity::getPrioritizedHashFunction(
return algorithm2;
}
-bool SubresourceIntegrity::CheckSubresourceIntegrity(const Element& element,
+bool SubresourceIntegrity::CheckSubresourceIntegrity(const String& attribute,
+ Document& document,
const char* content,
size_t size,
const KURL& resourceUrl,
const Resource& resource) {
- Document& document = element.document();
- String attribute = element.fastGetAttribute(HTMLNames::integrityAttr);
if (attribute.isEmpty())
return true;
@@ -119,19 +118,17 @@ bool SubresourceIntegrity::CheckSubresourceIntegrity(const Element& element,
if (integrityParseResult != IntegrityParseValidResult)
return true;
- return CheckSubresourceIntegrity(metadataSet, element, content, size,
+ return CheckSubresourceIntegrity(metadataSet, document, content, size,
resourceUrl, resource);
}
bool SubresourceIntegrity::CheckSubresourceIntegrity(
const IntegrityMetadataSet& metadataSet,
- const Element& element,
+ Document& document,
const char* content,
size_t size,
const KURL& resourceUrl,
const Resource& resource) {
- Document& document = element.document();
-
if (!resource.isEligibleForIntegrityCheck(document.getSecurityOrigin())) {
UseCounter::count(document,
UseCounter::SRIElementIntegrityAttributeButIneligible);

Powered by Google App Engine
This is Rietveld 408576698