WebKit Bugzilla
Attachment 362173 Details for
Bug 194719
: Add MSE logging configuration
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for landing
mse-logging-inspector-final-patch.txt (text/plain), 13.98 KB, created by
Eric Carlson
on 2019-02-15 15:50:46 PST
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Eric Carlson
Created:
2019-02-15 15:50:46 PST
Size:
13.98 KB
patch
obsolete
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 1af7989c41f..6d95b1f529f 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-14 Commit Queue <commit-queue@webkit.org> > > Unreviewed, rolling out r241497. >diff --git a/LayoutTests/inspector/console/webcore-logging-expected.txt b/LayoutTests/inspector/console/webcore-logging-expected.txt >index d282c05db2f..a328a5247fd 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 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 8fc4900a247..73ad9bd2669 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-15 Yusuke Suzuki <ysuzuki@apple.com> > > [JSC] Do not even allocate JIT worklists in non-JIT mode >diff --git a/Source/JavaScriptCore/inspector/ConsoleMessage.cpp b/Source/JavaScriptCore/inspector/ConsoleMessage.cpp >index 716ac441b7c..f73deef33aa 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 6b94399fac2..8fff4a99e74 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 86b0f07c799..d2aa2262f29 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 021c75357c2..fffebed6c9f 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/ChangeLog b/Source/WebCore/ChangeLog >index 96ab5cae43c..2dd09522887 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-15 Wenson Hsieh <wenson_hsieh@apple.com> > > Refactor EditingStyle::textDirection to return an Optional<WritingDirection> instead of a bool >diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp >index 050555ba949..75181992652 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 1359fa6c731..c963138dec5 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/ChangeLog b/Source/WebInspectorUI/ChangeLog >index b83b1ec2c2a..94cdb796499 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-14 Commit Queue <commit-queue@webkit.org> > > Unreviewed, rolling out r241497. >diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >index db390f6e696..61156edaf94 100644 >--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >@@ -590,6 +590,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"; >@@ -601,6 +602,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/Models/ConsoleMessage.js b/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js >index d061d52fd55..04a400822c4 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 ad3d248bbfb..cd0ca56423c 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/Views/LogContentView.js b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js >index 1caca5c4d30..903a4920e51 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js >@@ -90,6 +90,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.Media, WI.UIString("MediaSource"), {className: "mediasource"}), > new WI.ScopeBarItem(WI.LogContentView.Scopes.WebRTC, WI.UIString("WebRTC"), {className: "webrtc"}), > ]; > >diff --git a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js >index 52299bb0909..e0beda90f5e 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/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog >index 53b197bea99..5b262e600da 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-15 Truitt Savell <tsavell@apple.com> > > Unreviewed, rolling out r241564. >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm >index 167a3bf6143..f74a4f6aebd 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 @"";
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194719
:
362154
|
362163
|
362164
|
362173
|
362299