Index: third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
index fa913b355e0b6a734d61aa8b23ba618d11345793..27bba37015b40bd5592ecea7b13b70afe2f3a9fc 100644 |
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
@@ -736,16 +736,8 @@ bool ScriptLoader::doExecuteScript(const ScriptSourceCode& sourceCode) { |
if (!m_isExternalScript) { |
accessControlStatus = SharableCrossOrigin; |
} else if (sourceCode.resource()) { |
- if (sourceCode.resource()->response().wasFetchedViaServiceWorker()) { |
- if (sourceCode.resource()->response().serviceWorkerResponseType() == |
- WebServiceWorkerResponseTypeOpaque) |
- accessControlStatus = OpaqueResource; |
- else |
- accessControlStatus = SharableCrossOrigin; |
- } else if (sourceCode.resource()->passesAccessControlCheck( |
- m_element->document().getSecurityOrigin())) { |
- accessControlStatus = SharableCrossOrigin; |
- } |
+ accessControlStatus = sourceCode.resource()->calculateAccessControlStatus( |
+ m_element->document().getSecurityOrigin()); |
} |
const bool isImportedScript = contextDocument != elementDocument; |