Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (243717 => 243718)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-04-01 22:35:50 UTC (rev 243717)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-04-01 22:38:29 UTC (rev 243718)
@@ -1,5 +1,19 @@
2019-04-01 Devin Rousso <[email protected]>
+ Web Inspector: Canvas: add compatibility support for WebMetal
+ https://bugs.webkit.org/show_bug.cgi?id=196412
+ <rdar://problem/49439417>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Models/Canvas.js:
+ (WI.Canvas.fromPayload):
+ (WI.Canvas.displayNameForContextType):
+ * UserInterface/Protocol/Legacy/12.2/InspectorBackendCommands.js:
+ * Versions/Inspector-iOS-12.2.json:
+
+2019-04-01 Devin Rousso <[email protected]>
+
Web Inspector: "Copy as HTML" appears twice when showing a context menu for a logged node
https://bugs.webkit.org/show_bug.cgi?id=196271
<rdar://problem/49290676>
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Canvas.js (243717 => 243718)
--- trunk/Source/WebInspectorUI/UserInterface/Models/Canvas.js 2019-04-01 22:35:50 UTC (rev 243717)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Canvas.js 2019-04-01 22:38:29 UTC (rev 243718)
@@ -75,6 +75,9 @@
case CanvasAgent.ContextType.WebGPU:
contextType = WI.Canvas.ContextType.WebGPU;
break;
+ case CanvasAgent.ContextType.WebMetal:
+ contextType = WI.Canvas.ContextType.WebMetal;
+ break;
default:
console.error("Invalid canvas context type", payload.contextType);
}
@@ -101,6 +104,8 @@
return WI.unlocalizedString("WebGL2");
case WI.Canvas.ContextType.WebGPU:
return WI.unlocalizedString("Web GPU");
+ case WI.Canvas.ContextType.WebMetal:
+ return WI.unlocalizedString("WebMetal");
default:
console.error("Invalid canvas context type", contextType);
}
@@ -408,6 +413,7 @@
WebGL: "webgl",
WebGL2: "webgl2",
WebGPU: "webgpu",
+ WebMetal: "webmetal",
};
WI.Canvas.RecordingState = {
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/12.2/InspectorBackendCommands.js (243717 => 243718)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/12.2/InspectorBackendCommands.js 2019-04-01 22:35:50 UTC (rev 243717)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/12.2/InspectorBackendCommands.js 2019-04-01 22:38:29 UTC (rev 243718)
@@ -67,7 +67,7 @@
// Canvas.
InspectorBackend.registerCanvasDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Canvas");
-InspectorBackend.registerEnum("Canvas.ContextType", {Canvas2D: "canvas-2d", BitmapRenderer: "bitmaprenderer", WebGL: "webgl", WebGL2: "webgl2"});
+InspectorBackend.registerEnum("Canvas.ContextType", {Canvas2D: "canvas-2d", BitmapRenderer: "bitmaprenderer", WebGL: "webgl", WebGL2: "webgl2", WebMetal: "webmetal"});
InspectorBackend.registerEnum("Canvas.ShaderType", {Fragment: "fragment", Vertex: "vertex"});
InspectorBackend.registerEvent("Canvas.canvasAdded", ["canvas"]);
InspectorBackend.registerEvent("Canvas.canvasRemoved", ["canvasId"]);
Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-12.2.json (243717 => 243718)
--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-12.2.json 2019-04-01 22:35:50 UTC (rev 243717)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-12.2.json 2019-04-01 22:38:29 UTC (rev 243718)
@@ -493,7 +493,7 @@
{
"id": "ContextType",
"type": "string",
- "enum": ["canvas-2d", "bitmaprenderer", "webgl", "webgl2"],
+ "enum": ["canvas-2d", "bitmaprenderer", "webgl", "webgl2", "webmetal"],
"description": "The type of rendering context backing the canvas element."
},
{
