Modified: trunk/Source/_javascript_Core/ChangeLog (175361 => 175362)
--- trunk/Source/_javascript_Core/ChangeLog 2014-10-30 01:18:32 UTC (rev 175361)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-10-30 02:29:42 UTC (rev 175362)
@@ -1,3 +1,17 @@
+2014-10-29 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Fix Type Dependency Issues
+ https://bugs.webkit.org/show_bug.cgi?id=125664
+
+ Reviewed by Brian Burg.
+
+ Now that all JSON protocol files are processed together again
+ in r174892, we can remove the duplicated types which were only
+ needed when the domains were split.
+
+ * inspector/protocol/Console.json:
+ * inspector/protocol/Runtime.json:
+
2014-10-28 Commit Queue <[email protected]>
Unreviewed, rolling out r175249.
Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (175361 => 175362)
--- trunk/Source/_javascript_Core/inspector/protocol/Console.json 2014-10-30 01:18:32 UTC (rev 175361)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json 2014-10-30 02:29:42 UTC (rev 175362)
@@ -3,16 +3,6 @@
"description": "Console domain defines methods and events for interaction with the _javascript_ console. Console collects messages created by means of the <a href=''>_javascript_ Console API</a>. One needs to enable this domain using <code>enable</code> command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using <code>messageAdded</code> notification upon enabling.",
"types": [
{
- "id": "ConsoleNetworkRequestId",
- "type": "string",
- "description": "Unique request identifier. FIXME: Duplicate of Network.RequestId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
- },
- {
- "id": "ConsoleDOMNodeId",
- "type": "integer",
- "description": "Unique DOM node identifier. FIXME: Duplicate of DOM.NodeId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
- },
- {
"id": "ConsoleMessage",
"type": "object",
"description": "Console message.",
@@ -27,7 +17,7 @@
{ "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." },
{ "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
{ "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "_javascript_ stack trace for assertions and error messages." },
- { "name": "networkRequestId", "$ref": "ConsoleNetworkRequestId", "optional": true, "description": "Identifier of the network request associated with this message." }
+ { "name": "networkRequestId", "$ref": "Network.RequestId", "optional": true, "description": "Identifier of the network request associated with this message." }
]
},
{
@@ -71,7 +61,7 @@
{
"name": "addInspectedNode",
"parameters": [
- { "name": "nodeId", "$ref": "ConsoleDOMNodeId", "description": "DOM node id to be accessible by means of $x command line API." }
+ { "name": "nodeId", "$ref": "DOM.NodeId", "description": "DOM node id to be accessible by means of $x command line API." }
],
"description": "Enables console to refer to the node with given id via $x (see Command Line API for more details $x functions)."
}
Modified: trunk/Source/_javascript_Core/inspector/protocol/Runtime.json (175361 => 175362)
--- trunk/Source/_javascript_Core/inspector/protocol/Runtime.json 2014-10-30 01:18:32 UTC (rev 175361)
+++ trunk/Source/_javascript_Core/inspector/protocol/Runtime.json 2014-10-30 02:29:42 UTC (rev 175362)
@@ -82,11 +82,6 @@
"description": "Id of an execution context."
},
{
- "id": "RuntimeFrameId",
- "type": "string",
- "description": "Unique frame identifier. FIXME: Duplicate of Network.FrameId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
- },
- {
"id": "ExecutionContextDescription",
"type": "object",
"description": "Description of an isolated world.",
@@ -94,7 +89,7 @@
{ "name": "id", "$ref": "ExecutionContextId", "description": "Unique id of the execution context. It can be used to specify in which execution context script evaluation should be performed." },
{ "name": "isPageContext", "type": "boolean", "description": "True if this is a context where inpspected web page scripts run. False if it is a content script isolated context." },
{ "name": "name", "type": "string", "description": "Human readable name describing given context."},
- { "name": "frameId", "$ref": "RuntimeFrameId", "description": "Id of the owning frame." }
+ { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the owning frame." }
]
},
{
