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

Unified Diff: Source/core/html/HTMLImportsController.cpp

Issue 19940002: [HTML Import] Respect Content Security Policy Model (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix mac build failure. Created 7 years, 5 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: Source/core/html/HTMLImportsController.cpp
diff --git a/Source/core/html/HTMLImportsController.cpp b/Source/core/html/HTMLImportsController.cpp
index 68d4b6b74e50c3a57bc69f057041d55438671244..c578f25ddc7be740b5ad7f6aef23abe730ac1d49 100644
--- a/Source/core/html/HTMLImportsController.cpp
+++ b/Source/core/html/HTMLImportsController.cpp
@@ -90,7 +90,7 @@ void LinkImport::process()
CachedResourceRequest request = builder.build(true);
request.setPotentiallyCrossOriginEnabled(controller->securityOrigin(), DoNotAllowStoredCredentials);
- CachedResourceHandle<CachedRawResource> resource = controller->cachedResourceLoader()->requestRawResource(request);
+ CachedResourceHandle<CachedRawResource> resource = controller->cachedResourceLoader()->requestImport(request);
if (!resource)
return;
@@ -180,6 +180,7 @@ HTMLImportLoader::State HTMLImportLoader::startParsing(const ResourceResponse& r
return StateError;
m_importedDocument = HTMLDocument::create(DocumentInit(response.url(), 0, this));
+ m_importedDocument->initContentSecurityPolicy();
m_writer = DocumentWriter::create(m_importedDocument.get(), response.mimeType(), response.textEncodingName());
return StateLoading;

Powered by Google App Engine
This is Rietveld 408576698