Attachment 356970 Details for Bug 192525 – Patch

[patch] Patch

bug-192525-20181210100343.patch (text/plain), 5.59 KB, created by Dean Jackson on 2018-12-10 10:03:43 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2018-12-10 10:03:43 PST

Size: 5.59 KB

patch

obsolete

>Subversion Revision: 238874
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a587c101260ae57d245ad18ba8cc69b92b1c46e8..ba30646905e2aae2c23a8be839f5bd979f4cf921 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-12-07  Dean Jackson  <dino@apple.com>
>+
>+        Use text/javascript as recommended by the HTML specification
>+        https://bugs.webkit.org/show_bug.cgi?id=192525
>+        <rdar://problem/46569636>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The HTML specification says we should use text/javascript for
>+        JavaScript files:
>+        https://html.spec.whatwg.org/multipage/scripting.html#scriptingLanguages:javascript-mime-type
>+
>+        * loader/cache/CachedScript.cpp: Replace application/javascript with text/javascript.
>+        (WebCore::CachedScript::CachedScript):
>+        * platform/network/ios/WebCoreURLResponseIOS.mm: Ditto.
>+        (WebCore::createExtensionToMIMETypeMap):
>+        * platform/network/mac/WebCoreURLResponse.mm: Ditto.
>+        (WebCore::createExtensionToMIMETypeMap):
>+
> 2018-12-07  Dean Jackson  <dino@apple.com>
> 
>         [iOS] Make WebGPU work with remote layer hosting
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 9271caa8a2edab6b000f0e46c3c0d9f4824a98a0..8a65a39126fe2db78f361e5f12ae828be99ef279 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-12-07  Dean Jackson  <dino@apple.com>
>+
>+        Use text/javascript as recommended by the HTML specification
>+        https://bugs.webkit.org/show_bug.cgi?id=192525
>+        <rdar://problem/46569636>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The HTML specification says we should use text/javascript for
>+        JavaScript files:
>+        https://html.spec.whatwg.org/multipage/scripting.html#scriptingLanguages:javascript-mime-type
>+
>+        * UserInterface/Base/MIMETypeUtilities.js:
>+        (WI.mimeTypeForFileExtension):
>+        * UserInterface/Views/TextEditor.js:
>+        (WI.TextEditor.prototype._attemptToDetermineMIMEType):
>+
> 2018-12-04  Matt Baker  <mattbaker@apple.com>
> 
>         Web Inspector: REGRESSION(r238602): Elements: changing selection no longer highlights the selected node
>diff --git a/Source/WebCore/loader/cache/CachedScript.cpp b/Source/WebCore/loader/cache/CachedScript.cpp
>index 515f915de8311213255eb847f83986d13bd9bb18..225e91b5d507500fa4a44baf06730776603b8f1a 100644
>--- a/Source/WebCore/loader/cache/CachedScript.cpp
>+++ b/Source/WebCore/loader/cache/CachedScript.cpp
>@@ -38,7 +38,7 @@ namespace WebCore {
> 
> CachedScript::CachedScript(CachedResourceRequest&& request, PAL::SessionID sessionID)
>     : CachedResource(WTFMove(request), Type::Script, sessionID)
>-    , m_decoder(TextResourceDecoder::create("application/javascript"_s, request.charset()))
>+    , m_decoder(TextResourceDecoder::create("text/javascript"_s, request.charset()))
> {
> }
> 
>diff --git a/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm b/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm
>index 00b5ab2abc95b2cf71e800058c6f636ae307b6d3..4dcace2e9054877cd6f218a49506517c292ae7c0 100644
>--- a/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm
>+++ b/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm
>@@ -47,7 +47,7 @@ static CFDictionaryRef createExtensionToMIMETypeMap()
>     };
> 
>     CFStringRef values[] = {
>-        CFSTR("application/javascript")
>+        CFSTR("text/javascript")
>     };
> 
>     ASSERT(sizeof(keys) == sizeof(values));
>diff --git a/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm b/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm
>index 1471e31ebec507e9cc1fc0d268b75b8698939c16..abc3d3bd88309935d7222b4b0367f837951c1800 100644
>--- a/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm
>+++ b/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm
>@@ -212,7 +212,7 @@ static CFDictionaryRef createExtensionToMIMETypeMap()
>         CFSTR("application/x-troff-me"),
>         CFSTR("model/mesh"),
>         CFSTR("application/vnd.mif"),
>-        CFSTR("application/javascript"),
>+        CFSTR("text/javascript"),
>         CFSTR("video/x-sgi-movie"),
>         CFSTR("audio/mpeg"),
>         CFSTR("audio/mpeg"),
>diff --git a/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js b/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js
>index 87dfa143e3f96a63ab49a4bbaac6af661336285e..ed53a1f9352f5c87d2492d5c29e5933d3c37182b 100644
>--- a/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js
>+++ b/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js
>@@ -48,8 +48,8 @@ WI.mimeTypeForFileExtension = function(extension)
>         "xml": "text/xml",
> 
>         // Script types.
>-        "js": "application/javascript",
>-        "mjs": "application/javascript",
>+        "js": "text/javascript",
>+        "mjs": "text/javascript",
>         "json": "application/json",
>         "clj": "text/x-clojure",
>         "coffee": "text/x-coffeescript",
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TextEditor.js b/Source/WebInspectorUI/UserInterface/Views/TextEditor.js
>index 3ffe502a145852710450630bed8ec7c4dc36e2b6..8ee382a077bfa826ab8971a8ba68cc9a9d47bfae 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TextEditor.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TextEditor.js
>@@ -909,7 +909,7 @@ WI.TextEditor = class TextEditor extends WI.View
>             if (!formattedText)
>                 return;
> 
>-            this.mimeType = "application/javascript";
>+            this.mimeType = "text/javascript";
> 
>             if (Date.now() - startTime < 100)
>                 this.updateFormattedState(true);

Flags:

jonlee: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 192525: 356855 | 356858 | 356970