| Index: third_party/WebKit/Source/core/fetch/ScriptResource.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/ScriptResource.cpp b/third_party/WebKit/Source/core/fetch/ScriptResource.cpp
|
| index 2b5eaed3c737d62d37b8b1b4722b3281ea5814a2..15b6d99308b436839cf4ce5f5ee4292df735398b 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ScriptResource.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ScriptResource.cpp
|
| @@ -32,7 +32,6 @@
|
| #include "core/fetch/ResourceFetcher.h"
|
| #include "platform/MIMETypeRegistry.h"
|
| #include "platform/SharedBuffer.h"
|
| -#include "platform/network/HTTPParsers.h"
|
| #include "public/platform/WebProcessMemoryDump.h"
|
|
|
| namespace blink {
|
| @@ -85,11 +84,6 @@ void ScriptResource::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebP
|
| memoryDump->addSuballocation(dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName));
|
| }
|
|
|
| -AtomicString ScriptResource::mimeType() const
|
| -{
|
| - return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPNames::Content_Type)).lower();
|
| -}
|
| -
|
| const CompressibleString& ScriptResource::script()
|
| {
|
| ASSERT(!isPurgeable());
|
| @@ -115,7 +109,7 @@ void ScriptResource::destroyDecodedDataForFailedRevalidation()
|
|
|
| bool ScriptResource::mimeTypeAllowedByNosniff() const
|
| {
|
| - return parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPNames::X_Content_Type_Options)) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType());
|
| + return parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPNames::X_Content_Type_Options)) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJavaScriptMIMEType(httpContentType());
|
| }
|
|
|
| void ScriptResource::setIntegrityDisposition(ScriptIntegrityDisposition disposition)
|
|
|