Attachment 362299 Details for Bug 194719 – Updated pPatch for landing.

[patch] Updated pPatch for landing.

bug-194719-20190218082932.patch (text/plain), 17.61 KB, created by Eric Carlson on 2019-02-18 08:29:33 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-02-18 08:29:33 PST

Size: 17.61 KB

patch

obsolete

>Subversion Revision: 241662
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index eeff7e648620c59aa5ef2982828c5962a794065f..91dde9102e3e8adb9447182e2538e3c51394c24a 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-15  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Add MSE logging configuration
>+        https://bugs.webkit.org/show_bug.cgi?id=194719
>+        <rdar://problem/48122151>
>+
>+        Reviewed by Joseph Pecoraro.
>+
>+        * inspector/ConsoleMessage.cpp:
>+        (Inspector::messageSourceValue):
>+        * inspector/protocol/Console.json:
>+        * inspector/scripts/codegen/generator.py:
>+        * runtime/ConsoleTypes.h:
>+
> 2019-02-18  Tadeu Zagallo  <tzagallo@apple.com>
> 
>         Add version number to cached bytecode
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2141a8fc3dfb31427975501667bd3751a04b2ce6..f1f14e9dabe53f28faa776e3b752b8d5731f95f2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-02-15  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Add MSE logging configuration
>+        https://bugs.webkit.org/show_bug.cgi?id=194719
>+        <rdar://problem/48122151>
>+
>+        Reviewed by Joseph Pecoraro.
>+
>+        No new tests, updated inspector/console/webcore-logging.html.
>+
>+        * dom/Document.cpp:
>+        (WebCore::messageSourceForWTFLogChannel): Recognize the MSE logging channel.
>+
>+        * inspector/agents/WebConsoleAgent.cpp:
>+        (WebCore::WebConsoleAgent::getLoggingChannels): Ditto.
>+
> 2019-02-17  David Kilzer  <ddkilzer@apple.com>
> 
>         Unreviewed, rolling out r241620.
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index c08f51c9a095dab908cf57c7527c8d073d08159d..a559ec0fea760ba307b5bcda9dea5d6d70b1db54 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-02-15  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Add MSE logging configuration
>+        https://bugs.webkit.org/show_bug.cgi?id=194719
>+        <rdar://problem/48122151>
>+
>+        Reviewed by Joseph Pecoraro.
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+        * UserInterface/Models/ConsoleMessage.js:
>+        * UserInterface/Models/IssueMessage.js:
>+        (WI.IssueMessage):
>+        * UserInterface/Views/LogContentView.js:
>+        (WI.LogContentView):
>+        * UserInterface/Views/SettingsTabContentView.js:
>+        (WI.SettingsTabContentView.prototype._createGeneralSettingsView):
>+
> 2019-02-17  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Move CSS completion logic from SpreadsheetTextField to SpreadsheetStyleProperty
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index d7a3f6fb90f8c807dffbb0ede0b11f8d9f428afe..ccba06fd6a692aa4c668a6efc99a4ef5ab0f0c13 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-15  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Add MSE logging configuration
>+        https://bugs.webkit.org/show_bug.cgi?id=194719
>+        <rdar://problem/48122151>
>+
>+        Reviewed by Joseph Pecoraro.
>+
>+        * WebCoreSupport/WebChromeClient.mm:
>+        (stringForMessageSource): Recognize the MSE message source.
>+
> 2019-02-17  David Kilzer  <ddkilzer@apple.com>
> 
>         Unreviewed, rolling out r241620.
>diff --git a/Source/JavaScriptCore/inspector/ConsoleMessage.cpp b/Source/JavaScriptCore/inspector/ConsoleMessage.cpp
>index 716ac441b7c01df10188dbb8db7db9bcfce08deb..f73deef33aa7dd78c0a33aabdaa91c216e6daf9b 100644
>--- a/Source/JavaScriptCore/inspector/ConsoleMessage.cpp
>+++ b/Source/JavaScriptCore/inspector/ConsoleMessage.cpp
>@@ -170,6 +170,7 @@ static Protocol::Console::ChannelSource messageSourceValue(MessageSource source)
>     case MessageSource::Other: return Protocol::Console::ChannelSource::Other;
>     case MessageSource::Media: return Protocol::Console::ChannelSource::Media;
>     case MessageSource::WebRTC: return Protocol::Console::ChannelSource::WebRTC;
>+    case MessageSource::MediaSource: return Protocol::Console::ChannelSource::MediaSource;
>     }
>     return Protocol::Console::ChannelSource::Other;
> }
>diff --git a/Source/JavaScriptCore/inspector/protocol/Console.json b/Source/JavaScriptCore/inspector/protocol/Console.json
>index 6b94399fac248d1f3954afb9631df069d8f61ce0..8fff4a99e74f3beadd3e267091ccfe1dc249bd1d 100644
>--- a/Source/JavaScriptCore/inspector/protocol/Console.json
>+++ b/Source/JavaScriptCore/inspector/protocol/Console.json
>@@ -5,7 +5,7 @@
>         {
>             "id": "ChannelSource",
>             "type": "string",
>-            "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "content-blocker", "media", "webrtc", "other"],
>+            "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "content-blocker", "media", "mediasource", "webrtc", "other"],
>             "description": "Channels for different types of log messages."
>         },
>         {
>diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generator.py b/Source/JavaScriptCore/inspector/scripts/codegen/generator.py
>index 86b0f07c799089977e458a3791b321568588896c..d2aa2262f299f298b2d876d937c9cd7c21c21bfa 100755
>--- a/Source/JavaScriptCore/inspector/scripts/codegen/generator.py
>+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generator.py
>@@ -53,6 +53,7 @@ _ENUM_IDENTIFIER_RENAME_MAP = {
>     'webmetal': 'WebMetal',  # Canvas.ContextType.webmetal
>     'bitmaprenderer': 'BitmapRenderer',  # Canvas.ContextType.bitmaprenderer
>     'webrtc': 'WebRTC',  # Console.ChannelSource.webrtc
>+    'mediasource': 'MediaSource',  # Console.ChannelSource.mediasource
> }
> 
> # These objects are built manually by creating and setting JSON::Value instances.
>diff --git a/Source/JavaScriptCore/runtime/ConsoleTypes.h b/Source/JavaScriptCore/runtime/ConsoleTypes.h
>index 021c75357c2fc217e64d8eeab0063fabba88bf8b..fffebed6c9f2256e1ae0de331d02aa75f560e426 100644
>--- a/Source/JavaScriptCore/runtime/ConsoleTypes.h
>+++ b/Source/JavaScriptCore/runtime/ConsoleTypes.h
>@@ -43,6 +43,7 @@ enum class MessageSource : uint8_t {
>     Other,
>     Media,
>     WebRTC,
>+    MediaSource,
> };
> 
> enum class MessageType {
>@@ -88,7 +89,8 @@ template<> struct EnumTraits<JSC::MessageSource> {
>         JSC::MessageSource::ContentBlocker,
>         JSC::MessageSource::Other,
>         JSC::MessageSource::Media,
>-        JSC::MessageSource::WebRTC
>+        JSC::MessageSource::WebRTC,
>+        JSC::MessageSource::MediaSource
>     >;
> };
> 
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 050555ba9491f47ca0bb4dfdaaa193d9ac54edf9..75181992652d7d0acb12680ed631ca6cecb26e0d 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -8562,6 +8562,7 @@ static MessageSource messageSourceForWTFLogChannel(const WTFLogChannel& channel)
> {
>     static const NeverDestroyed<String> mediaChannel = MAKE_STATIC_STRING_IMPL("media");
>     static const NeverDestroyed<String> webrtcChannel = MAKE_STATIC_STRING_IMPL("webrtc");
>+    static const NeverDestroyed<String> mediaSourceChannel = MAKE_STATIC_STRING_IMPL("mediasource");
> 
>     if (equalIgnoringASCIICase(mediaChannel, channel.name))
>         return MessageSource::Media;
>@@ -8569,6 +8570,9 @@ static MessageSource messageSourceForWTFLogChannel(const WTFLogChannel& channel)
>     if (equalIgnoringASCIICase(webrtcChannel, channel.name))
>         return MessageSource::WebRTC;
> 
>+    if (equalIgnoringASCIICase(mediaSourceChannel, channel.name))
>+        return MessageSource::MediaSource;
>+
>     return MessageSource::Other;
> }
> 
>diff --git a/Source/WebCore/inspector/agents/WebConsoleAgent.cpp b/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
>index 1359fa6c731cca839445acd37263be47571ff695..c963138dec5427bfab327a50bfcf25abca282c25 100644
>--- a/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
>+++ b/Source/WebCore/inspector/agents/WebConsoleAgent.cpp
>@@ -56,6 +56,7 @@ void WebConsoleAgent::getLoggingChannels(ErrorString&, RefPtr<JSON::ArrayOf<Insp
>     } channelTable[] = {
>         { MAKE_STATIC_STRING_IMPL("WebRTC"), Inspector::Protocol::Console::ChannelSource::WebRTC },
>         { MAKE_STATIC_STRING_IMPL("Media"), Inspector::Protocol::Console::ChannelSource::Media },
>+        { MAKE_STATIC_STRING_IMPL("MediaSource"), Inspector::Protocol::Console::ChannelSource::MediaSource },
>     };
> 
>     channels = JSON::ArrayOf<Inspector::Protocol::Console::Channel>::create();
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index 6fd8ea7c82bfc45bd4190df53929158f7a1d3ccd..a2b113e172a587d730ad9af70a81ed438d99ef2a 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -593,6 +593,7 @@ localizedStrings["Low-Power Mode"] = "Low-Power Mode";
> localizedStrings["Lowest: %s"] = "Lowest: %s";
> localizedStrings["MIME Type"] = "MIME Type";
> localizedStrings["MIME Type:"] = "MIME Type:";
>+localizedStrings["MSE Logging:"] = "MSE Logging:";
> localizedStrings["Manifest URL"] = "Manifest URL";
> localizedStrings["Mass"] = "Mass";
> localizedStrings["Matching"] = "Matching";
>@@ -604,6 +605,7 @@ localizedStrings["Maximum maximum memory size in this recording"] = "Maximum max
> localizedStrings["Media"] = "Media";
> localizedStrings["Media Event"] = "Media Event";
> localizedStrings["Media Logging:"] = "Media Logging:";
>+localizedStrings["MediaSource"] = "MediaSource";
> localizedStrings["Medium"] = "Medium";
> localizedStrings["Memory"] = "Memory";
> localizedStrings["Memory Cache"] = "Memory Cache";
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js b/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js
>index bc56eb1c98edc1bfb8d2727ca289f8dda6165194..52f72a4f3bfe8bdd53890f4d9cb3b7539685094f 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js
>@@ -160,7 +160,7 @@ WI.ConsoleManager = class ConsoleManager extends WI.Object
>         if (this._loggingChannelSources.length)
>             return;
> 
>-        this._loggingChannelSources = [WI.ConsoleMessage.MessageSource.Media, WI.ConsoleMessage.MessageSource.WebRTC];
>+        this._loggingChannelSources = [WI.ConsoleMessage.MessageSource.Media, WI.ConsoleMessage.MessageSource.WebRTC, , WI.ConsoleMessage.MessageSource.MessageSource];
> 
>         target.ConsoleAgent.getLoggingChannels((error, channels) => {
>             if (error)
>diff --git a/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js b/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js
>index d061d52fd55171419e87b77ff844148dbb20c18c..04a400822c490db6f2d25fdee5053d4e9f0aa09b 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js
>@@ -110,6 +110,7 @@ WI.ConsoleMessage.MessageSource = {
>     Security: "security",
>     Other: "other",
>     Media: "media",
>+    MediaSource: "mediasource",
>     WebRTC: "webrtc",
> };
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js b/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js
>index ad3d248bbfbfb4c370b1f4e754167afb4df07207..cd0ca56423c07d490c3b389d87e5c88a57d9868a 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js
>@@ -67,6 +67,7 @@ WI.IssueMessage = class IssueMessage extends WI.Object
>         case "rendering":
>         case "other":
>         case "media":
>+        case "mediasource":
>         case "webrtc":
>             this._type = WI.IssueMessage.Type.OtherIssue;
>             break;
>diff --git a/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js b/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
>index 162cd7b5de735cc713505be930445d6d703b4e37..cbb4f5cdff905b7dd76d26e461b57622b2d92e37 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js
>@@ -28,7 +28,7 @@ WI.LoggingChannel = class LoggingChannel
>     constructor(source, level)
>     {
>         console.assert(typeof source === "string");
>-        console.assert(source === WI.ConsoleMessage.MessageSource.Media || source === WI.ConsoleMessage.MessageSource.WebRTC);
>+        console.assert(source === WI.ConsoleMessage.MessageSource.Media || source === WI.ConsoleMessage.MessageSource.WebRTC || source === WI.ConsoleMessage.MessageSource.MediaSource);
> 
>         console.assert(typeof level === "string");
>         console.assert(Object.values(WI.LoggingChannel.Level).includes(level));
>diff --git a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>index 964bd004ef1b8db7edf52ea068b059420681c90b..c002a1993e5b0aa9ceee54705a7580fba3d42fd4 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>@@ -99,6 +99,7 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>             let messageChannelBarItems = [
>                 new WI.ScopeBarItem(WI.LogContentView.Scopes.AllChannels, WI.UIString("All"), {exclusive: true}),
>                 new WI.ScopeBarItem(WI.LogContentView.Scopes.Media, WI.UIString("Media"), {className: "media"}),
>+                new WI.ScopeBarItem(WI.LogContentView.Scopes.MediaSource, WI.UIString("MediaSource"), {className: "mediasource"}),
>                 new WI.ScopeBarItem(WI.LogContentView.Scopes.WebRTC, WI.UIString("WebRTC"), {className: "webrtc"}),
>             ];
> 
>@@ -390,6 +391,8 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>             return WI.LogContentView.Scopes.Media;
>         case WI.ConsoleMessage.MessageSource.WebRTC:
>             return WI.LogContentView.Scopes.WebRTC;
>+        case WI.ConsoleMessage.MessageSource.MediaSource:
>+            return WI.LogContentView.Scopes.MediaSource;
>         }
> 
>         return undefined;
>@@ -1175,6 +1178,7 @@ WI.LogContentView.Scopes = {
>     AllChannels: "log-all-channels",
>     Media: "log-media",
>     WebRTC: "log-webrtc",
>+    MediaSource: "log-mediasource",
> };
> 
> WI.LogContentView.ItemWrapperStyleClassName = "console-item";
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>index 52299bb09097273cf7d688054900850937efc636..e0beda90f5e3993fc23fa5af71e5a5f17e6a05d8 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
>@@ -227,6 +227,7 @@ WI.SettingsTabContentView = class SettingsTabContentView extends WI.TabContentVi
>             ];
>             const editorLabels = {
>                 media: WI.UIString("Media Logging:"),
>+                mediasource: WI.UIString("MSE Logging:"),
>                 webrtc: WI.UIString("WebRTC Logging:"),
>             };
> 
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm
>index 167a3bf6143dc9332635f5f3fbc206e22c257bb8..f74a4f6aebdb9462a3302f6daab25dd5768b75e6 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm
>@@ -122,6 +122,7 @@ NSString *WebConsoleMessageContentBlockerMessageSource = @"ContentBlockerMessage
> NSString *WebConsoleMessageOtherMessageSource = @"OtherMessageSource";
> NSString *WebConsoleMessageMediaMessageSource = @"MediaMessageSource";
> NSString *WebConsoleMessageWebRTCMessageSource = @"WebRTCMessageSource";
>+NSString *WebConsoleMessageMediaSourceMessageSource = @"MediaSourceMessageSource";
> 
> NSString *WebConsoleMessageDebugMessageLevel = @"DebugMessageLevel";
> NSString *WebConsoleMessageLogMessageLevel = @"LogMessageLevel";
>@@ -397,6 +398,8 @@ inline static NSString *stringForMessageSource(MessageSource source)
>         return WebConsoleMessageMediaMessageSource;
>     case MessageSource::WebRTC:
>         return WebConsoleMessageWebRTCMessageSource;
>+    case MessageSource::MediaSource:
>+        return WebConsoleMessageMediaSourceMessageSource;
>     }
>     ASSERT_NOT_REACHED();
>     return @"";
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index aff6228eb60819cc69266067fa02eada18d9bc28..26eae27a5b4cd4aa207647a27f7b5386ba635296 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-02-15  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Add MSE logging configuration
>+        https://bugs.webkit.org/show_bug.cgi?id=194719
>+        <rdar://problem/48122151>
>+
>+        Reviewed by Joseph Pecoraro.
>+
>+        * inspector/console/webcore-logging-expected.txt:
>+
> 2019-02-17  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Use dumpJSConsoleLogInStdErr=true webkit-test-runner option for non-imported tests instead of using DumpJSConsoleLogInStdErr expectation in TestExpectations
>diff --git a/LayoutTests/inspector/console/webcore-logging-expected.txt b/LayoutTests/inspector/console/webcore-logging-expected.txt
>index d282c05db2fe6ea7aeb1a61b343f3f0e17600c37..a328a5247fdc250242086e5fb161b5286aa60855 100644
>--- a/LayoutTests/inspector/console/webcore-logging-expected.txt
>+++ b/LayoutTests/inspector/console/webcore-logging-expected.txt
>@@ -13,6 +13,8 @@ PASS: Log channel has known source.
> PASS: Log channel disabled by default.
> PASS: Log channel has known source.
> PASS: Log channel disabled by default.
>+PASS: Log channel has known source.
>+PASS: Log channel disabled by default.
> 
> -- Running test case: Console.Logging.InvalidChannel
> PASS: Logging channel not found

Actions: View | Formatted Diff | Diff

Attachments on bug 194719: 362154 | 362163 | 362164 | 362173 | 362299