Diff
Modified: trunk/LayoutTests/ChangeLog (241728 => 241729)
--- trunk/LayoutTests/ChangeLog 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/LayoutTests/ChangeLog 2019-02-18 18:38:03 UTC (rev 241729)
@@ -1,3 +1,13 @@
+2019-02-18 Eric Carlson <eric.carl...@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-18 Alex Christensen <achristen...@webkit.org>
Disable safe browsing in WKWebView and remove its WKPreferences API
Modified: trunk/LayoutTests/inspector/console/webcore-logging-expected.txt (241728 => 241729)
--- trunk/LayoutTests/inspector/console/webcore-logging-expected.txt 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/LayoutTests/inspector/console/webcore-logging-expected.txt 2019-02-18 18:38:03 UTC (rev 241729)
@@ -13,6 +13,8 @@
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
Modified: trunk/Source/_javascript_Core/ChangeLog (241728 => 241729)
--- trunk/Source/_javascript_Core/ChangeLog 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-02-18 18:38:03 UTC (rev 241729)
@@ -1,3 +1,17 @@
+2019-02-18 Eric Carlson <eric.carl...@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 <tzaga...@apple.com>
Add version number to cached bytecode
Modified: trunk/Source/_javascript_Core/inspector/ConsoleMessage.cpp (241728 => 241729)
--- trunk/Source/_javascript_Core/inspector/ConsoleMessage.cpp 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/_javascript_Core/inspector/ConsoleMessage.cpp 2019-02-18 18:38:03 UTC (rev 241729)
@@ -170,6 +170,7 @@
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;
}
Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (241728 => 241729)
--- trunk/Source/_javascript_Core/inspector/protocol/Console.json 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json 2019-02-18 18:38:03 UTC (rev 241729)
@@ -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."
},
{
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py (241728 => 241729)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2019-02-18 18:38:03 UTC (rev 241729)
@@ -53,6 +53,7 @@
'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.
Modified: trunk/Source/_javascript_Core/runtime/ConsoleTypes.h (241728 => 241729)
--- trunk/Source/_javascript_Core/runtime/ConsoleTypes.h 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/_javascript_Core/runtime/ConsoleTypes.h 2019-02-18 18:38:03 UTC (rev 241729)
@@ -43,6 +43,7 @@
Other,
Media,
WebRTC,
+ MediaSource,
};
enum class MessageType {
@@ -88,7 +89,8 @@
JSC::MessageSource::ContentBlocker,
JSC::MessageSource::Other,
JSC::MessageSource::Media,
- JSC::MessageSource::WebRTC
+ JSC::MessageSource::WebRTC,
+ JSC::MessageSource::MediaSource
>;
};
Modified: trunk/Source/WebCore/ChangeLog (241728 => 241729)
--- trunk/Source/WebCore/ChangeLog 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebCore/ChangeLog 2019-02-18 18:38:03 UTC (rev 241729)
@@ -1,3 +1,19 @@
+2019-02-18 Eric Carlson <eric.carl...@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-18 Antoine Quint <grao...@apple.com>
[iOS] Dispatch additional events along with pointerdown and pointerup
Modified: trunk/Source/WebCore/dom/Document.cpp (241728 => 241729)
--- trunk/Source/WebCore/dom/Document.cpp 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebCore/dom/Document.cpp 2019-02-18 18:38:03 UTC (rev 241729)
@@ -8562,6 +8562,7 @@
{
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 @@
if (equalIgnoringASCIICase(webrtcChannel, channel.name))
return MessageSource::WebRTC;
+ if (equalIgnoringASCIICase(mediaSourceChannel, channel.name))
+ return MessageSource::MediaSource;
+
return MessageSource::Other;
}
Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (241728 => 241729)
--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp 2019-02-18 18:38:03 UTC (rev 241729)
@@ -56,6 +56,7 @@
} 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();
Modified: trunk/Source/WebInspectorUI/ChangeLog (241728 => 241729)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-02-18 18:38:03 UTC (rev 241729)
@@ -1,3 +1,20 @@
+2019-02-18 Eric Carlson <eric.carl...@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 <nvasil...@apple.com>
Web Inspector: Move CSS completion logic from SpreadsheetTextField to SpreadsheetStyleProperty
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -593,6 +593,7 @@
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["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";
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ConsoleManager.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -160,7 +160,7 @@
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)
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -110,6 +110,7 @@
Security: "security",
Other: "other",
Media: "media",
+ MediaSource: "mediasource",
WebRTC: "webrtc",
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -67,6 +67,7 @@
case "rendering":
case "other":
case "media":
+ case "mediasource":
case "webrtc":
this._type = WI.IssueMessage.Type.OtherIssue;
break;
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LoggingChannel.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -28,7 +28,7 @@
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));
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -99,6 +99,7 @@
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 @@
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 @@
AllChannels: "log-all-channels",
Media: "log-media",
WebRTC: "log-webrtc",
+ MediaSource: "log-mediasource",
};
WI.LogContentView.ItemWrapperStyleClassName = "console-item";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (241728 => 241729)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2019-02-18 18:38:03 UTC (rev 241729)
@@ -227,6 +227,7 @@
];
const editorLabels = {
media: WI.UIString("Media Logging:"),
+ mediasource: WI.UIString("MSE Logging:"),
webrtc: WI.UIString("WebRTC Logging:"),
};
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (241728 => 241729)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-02-18 18:38:03 UTC (rev 241729)
@@ -1,3 +1,14 @@
+2019-02-18 Eric Carlson <eric.carl...@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 <ddkil...@apple.com>
Unreviewed, rolling out r241620.
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm (241728 => 241729)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm 2019-02-18 18:34:41 UTC (rev 241728)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm 2019-02-18 18:38:03 UTC (rev 241729)
@@ -122,6 +122,7 @@
NSString *WebConsoleMessageOtherMessageSource = @"OtherMessageSource";
NSString *WebConsoleMessageMediaMessageSource = @"MediaMessageSource";
NSString *WebConsoleMessageWebRTCMessageSource = @"WebRTCMessageSource";
+NSString *WebConsoleMessageMediaSourceMessageSource = @"MediaSourceMessageSource";
NSString *WebConsoleMessageDebugMessageLevel = @"DebugMessageLevel";
NSString *WebConsoleMessageLogMessageLevel = @"LogMessageLevel";
@@ -397,6 +398,8 @@
return WebConsoleMessageMediaMessageSource;
case MessageSource::WebRTC:
return WebConsoleMessageWebRTCMessageSource;
+ case MessageSource::MediaSource:
+ return WebConsoleMessageMediaSourceMessageSource;
}
ASSERT_NOT_REACHED();
return @"";
