Skip to content

Commit ea69cfa

Browse files
author
[email protected]
committed
Web Inspector: move Console.addInspectedNode to DOM.setInspectedNode
https://bugs.webkit.org/show_bug.cgi?id=176827 Reviewed by Joseph Pecoraro. Source/JavaScriptCore: * inspector/agents/InspectorConsoleAgent.h: * inspector/agents/JSGlobalObjectConsoleAgent.h: * inspector/agents/JSGlobalObjectConsoleAgent.cpp: (Inspector::JSGlobalObjectConsoleAgent::addInspectedNode): Deleted. * inspector/protocol/Console.json: * inspector/protocol/DOM.json: Source/WebCore: Tests: http/tests/inspector/dom/cross-domain-inspected-node-access.html inspector/dom/setInspectedNode.html * inspector/InspectorDOMAgent.h: * inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::setInspectedNode): * inspector/PageConsoleAgent.h: * inspector/PageConsoleAgent.cpp: (WebCore::PageConsoleAgent::addInspectedNode): Deleted. * inspector/WorkerConsoleAgent.h: * inspector/WorkerConsoleAgent.cpp: (WebCore::WorkerConsoleAgent::addInspectedNode): Deleted. Source/WebInspectorUI: * UserInterface/Controllers/DOMTreeManager.js: (WI.DOMTreeManager): (WI.DOMTreeManager.prototype.setInspectedNode): * UserInterface/Views/DOMTreeContentView.js: (WI.DOMTreeContentView.prototype._selectedNodeDidChange): LayoutTests: * http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt: Renamed from LayoutTests/http/tests/inspector/console/cross-domain-inspected-node-access-expected.txt. * http/tests/inspector/dom/cross-domain-inspected-node-access.html: Renamed from LayoutTests/http/tests/inspector/console/cross-domain-inspected-node-access.html. * inspector/console/command-line-api.html: * inspector/dom/setInspectedNode-expected.txt: Renamed from LayoutTests/inspector/console/addInspectedNode-expected.txt. * inspector/dom/setInspectedNode.html: Renamed from LayoutTests/inspector/console/addInspectedNode.html. * platform/gtk/TestExpectations: * platform/mac/TestExpectations: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 557c600 commit ea69cfa

24 files changed

+144
-63
lines changed

‎LayoutTests/ChangeLog

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2017-09-25 Devin Rousso <[email protected]>
2+
3+
Web Inspector: move Console.addInspectedNode to DOM.setInspectedNode
4+
https://bugs.webkit.org/show_bug.cgi?id=176827
5+
6+
Reviewed by Joseph Pecoraro.
7+
8+
* http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt: Renamed from LayoutTests/http/tests/inspector/console/cross-domain-inspected-node-access-expected.txt.
9+
* http/tests/inspector/dom/cross-domain-inspected-node-access.html: Renamed from LayoutTests/http/tests/inspector/console/cross-domain-inspected-node-access.html.
10+
* inspector/console/command-line-api.html:
11+
* inspector/dom/setInspectedNode-expected.txt: Renamed from LayoutTests/inspector/console/addInspectedNode-expected.txt.
12+
* inspector/dom/setInspectedNode.html: Renamed from LayoutTests/inspector/console/addInspectedNode.html.
13+
* platform/gtk/TestExpectations:
14+
* platform/mac/TestExpectations:
15+
116
2017-09-25 Devin Rousso <[email protected]>
217

318
Web Inspector: Add autocompletion suggestions for CSS attr based on the selected element's attributes

‎LayoutTests/http/tests/inspector/console/cross-domain-inspected-node-access-expected.txt renamed to ‎LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt

File renamed without changes.

‎LayoutTests/http/tests/inspector/console/cross-domain-inspected-node-access.html renamed to ‎LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
description: "Should not be able to access $0 node in different domain subframe from the main frame.",
2020
test(resolve, reject) {
2121
InspectorTest.log("Setting $0 to node within subframe.");
22-
ConsoleAgent.addInspectedNode(nodeInSubFrameId);
22+
DOMAgent.setInspectedNode(nodeInSubFrameId);
2323
RuntimeAgent.evaluate.invoke({expression: "$0", includeCommandLineAPI: true}, (error, remoteObjectPayload, wasThrown) => {
2424
InspectorTest.assert(!error, "Should not be a protocol error.");
2525
InspectorTest.assert(!wasThrown, "Should not be an exception.");
@@ -35,7 +35,7 @@
3535
description: "Should be able to access $0 node in the same frame.",
3636
test(resolve, reject) {
3737
InspectorTest.log("Setting $0 to node within the main frame.");
38-
ConsoleAgent.addInspectedNode(nodeInMainFrameId);
38+
DOMAgent.setInspectedNode(nodeInMainFrameId);
3939
RuntimeAgent.evaluate.invoke({expression: "$0", includeCommandLineAPI: true}, (error, remoteObjectPayload, wasThrown) => {
4040
InspectorTest.assert(!error, "Should not be a protocol error.");
4141
InspectorTest.assert(!wasThrown, "Should not be an exception.");
@@ -51,7 +51,7 @@
5151
description: "Should not be able to access $0 node in different domain main frame from the subframe.",
5252
test(resolve, reject) {
5353
InspectorTest.log("Setting $0 to node within the main frame.");
54-
ConsoleAgent.addInspectedNode(nodeInMainFrameId);
54+
DOMAgent.setInspectedNode(nodeInMainFrameId);
5555
RuntimeAgent.evaluate.invoke({expression: "$0", includeCommandLineAPI: true, contextId: childFrames[0].pageExecutionContext.id}, (error, remoteObjectPayload, wasThrown) => {
5656
InspectorTest.assert(!error, "Should not be a protocol error.");
5757
InspectorTest.assert(!wasThrown, "Should not be an exception.");
@@ -67,7 +67,7 @@
6767
description: "Should be able to access $0 node in the same frame.",
6868
test(resolve, reject) {
6969
InspectorTest.log("Setting $0 to node within the subframe.");
70-
ConsoleAgent.addInspectedNode(nodeInSubFrameId);
70+
DOMAgent.setInspectedNode(nodeInSubFrameId);
7171
RuntimeAgent.evaluate.invoke({expression: "$0", includeCommandLineAPI: true, contextId: childFrames[0].pageExecutionContext.id}, (error, remoteObjectPayload, wasThrown) => {
7272
InspectorTest.assert(!error, "Should not be a protocol error.");
7373
InspectorTest.assert(!wasThrown, "Should not be an exception.");

‎LayoutTests/inspector/console/command-line-api.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
return reject();
104104
}
105105

106-
ConsoleAgent.addInspectedNode(contentNodeId);
106+
DOMAgent.setInspectedNode(contentNodeId);
107107
resolve();
108108
});
109109
});

‎LayoutTests/inspector/console/addInspectedNode-expected.txt renamed to ‎LayoutTests/inspector/dom/setInspectedNode-expected.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Test for the Console.addInspectedNode command.
1+
Test for the DOM.setInspectedNode command.
22

33

4-
== Running test suite: Console.addInspectedNode
4+
== Running test suite: DOM.setInspectedNode
55
-- Running test case: Check$0IsUndefined
66
PASS: $0 should be undefined.
77

‎LayoutTests/inspector/console/addInspectedNode.html renamed to ‎LayoutTests/inspector/dom/setInspectedNode.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
let nodeA, nodeB;
1313

14-
let suite = InspectorTest.createAsyncSuite("Console.addInspectedNode");
14+
let suite = InspectorTest.createAsyncSuite("DOM.setInspectedNode");
1515

1616
suite.addTestCase({
1717
name: "Check$0IsUndefined",
@@ -28,7 +28,7 @@
2828
name: "SetAndCheckNodeA",
2929
description: "Set the inspected node to be Node A and check that $0 is Node A.",
3030
test(resolve, reject) {
31-
ConsoleAgent.addInspectedNode(nodeA.id);
31+
DOMAgent.setInspectedNode(nodeA.id);
3232
evaluate$0((remoteObject) => {
3333
remoteObject.pushNodeToFrontend((nodeId) => {
3434
InspectorTest.expectThat(remoteObject.isNode(), "$0 should be a node.");
@@ -43,7 +43,7 @@
4343
name: "SetBadNodeId",
4444
description: "If an invalid inspected node is set, it should not be bound to $0.",
4545
test(resolve, reject) {
46-
ConsoleAgent.addInspectedNode(999999, (error) => {
46+
DOMAgent.setInspectedNode(999999, (error) => {
4747
InspectorTest.expectThat(error, "Should be an error");
4848
});
4949
evaluate$0((remoteObject) => {
@@ -60,7 +60,7 @@
6060
name: "SetAndCheckNodeB",
6161
description: "Set the inspected node to be Node B and check that $0 is Node B.",
6262
test(resolve, reject) {
63-
ConsoleAgent.addInspectedNode(nodeB.id);
63+
DOMAgent.setInspectedNode(nodeB.id);
6464
evaluate$0((remoteObject) => {
6565
remoteObject.pushNodeToFrontend((nodeId) => {
6666
InspectorTest.expectThat(remoteObject.isNode(), "$0 should be a node.");
@@ -89,7 +89,7 @@
8989
</script>
9090
</head>
9191
<body onload="runTest()">
92-
<p>Test for the Console.addInspectedNode command.</p>
92+
<p>Test for the DOM.setInspectedNode command.</p>
9393
<div style="display:none">
9494
<p id="a">Node A</p>
9595
<p id="b">Node B</p>

‎LayoutTests/platform/gtk/TestExpectations

+2-2
Original file line numberDiff line numberDiff line change
@@ -2000,7 +2000,6 @@ webkit.org/b/149916 http/tests/inspector/dom/disconnect-dom-tree-after-main-fram
20002000
webkit.org/b/149916 inspector/codemirror/prettyprinting-css.html [ Pass Slow ]
20012001
webkit.org/b/149916 inspector/codemirror/prettyprinting-css-rules.html [ Pass Timeout ]
20022002
webkit.org/b/149916 inspector/codemirror/prettyprinting-javascript.html [ Pass Slow ]
2003-
webkit.org/b/149916 inspector/console/addInspectedNode.html [ Pass Slow ]
20042003
webkit.org/b/149916 inspector/console/clearMessages.html [ Pass Slow ]
20052004
webkit.org/b/149916 inspector/console/command-line-api.html [ Pass Slow ]
20062005
webkit.org/b/149916 inspector/console/console-api.html [ Pass Timeout ]
@@ -2021,6 +2020,7 @@ webkit.org/b/149916 inspector/css/stylesheet-events-imports.html [ Pass Slow ]
20212020
webkit.org/b/149916 inspector/css/stylesheet-events-inspector-stylesheet.html [ Pass Slow ]
20222021
webkit.org/b/149916 inspector/css/stylesheet-events-multiple-documents.html [ Pass Slow ]
20232022
webkit.org/b/149916 inspector/css/stylesheet-with-mutations.html [ Pass Slow ]
2023+
webkit.org/b/149916 inspector/dom/setInspectedNode.html [ Pass Slow ]
20242024
webkit.org/b/149916 inspector/heap/garbageCollected.html [ Pass Slow ]
20252025
webkit.org/b/149916 inspector/heap/gc.html [ Pass Slow ]
20262026
webkit.org/b/149916 inspector/network/client-blocked-load.html [ Pass Slow ]
@@ -2086,7 +2086,7 @@ webkit.org/b/116958 http/tests/navigation/scrollstate-after-location-reload.html
20862086

20872087
webkit.org/b/120682 inspector/page/archive.html [ Timeout ]
20882088

2089-
webkit.org/b/122571 http/tests/inspector/console/cross-domain-inspected-node-access.html [ Timeout Pass ]
2089+
webkit.org/b/122571 http/tests/inspector/dom/cross-domain-inspected-node-access.html [ Timeout Pass ]
20902090
webkit.org/b/122571 inspector/debugger/setBreakpoint.html [ Timeout Pass ]
20912091
webkit.org/b/122571 inspector/debugger/call-frame-function-name.html [ Timeout Pass ]
20922092
webkit.org/b/122571 inspector/debugger/setBreakpoint-options-exception.html [ Timeout Pass ]

‎LayoutTests/platform/mac/TestExpectations

+1-1
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ webkit.org/b/127116 [ Debug ] svg/custom/animate-initial-pause-unpause.html [ Pa
13781378

13791379
webkit.org/b/161720 [ Debug ] storage/indexeddb/key-type-array.html [ Pass Timeout ]
13801380

1381-
webkit.org/b/155138 [ Debug ] inspector/console/addInspectedNode.html [ Pass Timeout ]
1381+
webkit.org/b/155138 [ Debug ] inspector/dom/setInspectedNode.html [ Pass Timeout ]
13821382

13831383
webkit.org/b/163046 js/regress-141098.html [ Pass Failure ]
13841384

‎Source/JavaScriptCore/ChangeLog

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2017-09-25 Devin Rousso <[email protected]>
2+
3+
Web Inspector: move Console.addInspectedNode to DOM.setInspectedNode
4+
https://bugs.webkit.org/show_bug.cgi?id=176827
5+
6+
Reviewed by Joseph Pecoraro.
7+
8+
* inspector/agents/InspectorConsoleAgent.h:
9+
10+
* inspector/agents/JSGlobalObjectConsoleAgent.h:
11+
* inspector/agents/JSGlobalObjectConsoleAgent.cpp:
12+
(Inspector::JSGlobalObjectConsoleAgent::addInspectedNode): Deleted.
13+
14+
* inspector/protocol/Console.json:
15+
* inspector/protocol/DOM.json:
16+
117
2017-09-25 Ryan Haddad <[email protected]>
218

319
Unreviewed, rebaseline builtins generator tests after r222473.

‎Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class JS_EXPORT_PRIVATE InspectorConsoleAgent : public InspectorAgentBase, publi
6262
void disable(ErrorString&) override;
6363
void clearMessages(ErrorString&) override;
6464
void setMonitoringXHREnabled(ErrorString&, bool enabled) override = 0;
65-
void addInspectedNode(ErrorString&, int nodeId) override = 0;
6665

6766
bool enabled() const { return m_enabled; }
6867
void reset();

‎Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,4 @@ void JSGlobalObjectConsoleAgent::setMonitoringXHREnabled(ErrorString& errorStrin
3838
errorString = ASCIILiteral("Not supported for JavaScript context");
3939
}
4040

41-
void JSGlobalObjectConsoleAgent::addInspectedNode(ErrorString& errorString, int)
42-
{
43-
errorString = ASCIILiteral("Not supported for JavaScript context");
44-
}
45-
4641
} // namespace Inspector

‎Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class JSGlobalObjectConsoleAgent final : public InspectorConsoleAgent {
3838

3939
// FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
4040
void setMonitoringXHREnabled(ErrorString&, bool enabled) override;
41-
void addInspectedNode(ErrorString&, int nodeId) override;
4241
};
4342

4443
} // namespace Inspector

‎Source/JavaScriptCore/inspector/protocol/Console.json

-7
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@
6464
"parameters": [
6565
{ "name": "enabled", "type": "boolean", "description": "Monitoring enabled state." }
6666
]
67-
},
68-
{
69-
"name": "addInspectedNode",
70-
"description": "Enables console to refer to the node with given id via $0 (see Command Line API for more details).",
71-
"parameters": [
72-
{ "name": "nodeId", "$ref": "DOM.NodeId", "description": "DOM node id to be accessible by means of $0 command line API." }
73-
]
7467
}
7568
],
7669
"events": [

‎Source/JavaScriptCore/inspector/protocol/DOM.json

+7
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,13 @@
475475
"parameters": [
476476
{ "name": "nodeId", "$ref": "NodeId", "description": "Id of the node to focus." }
477477
]
478+
},
479+
{
480+
"name": "setInspectedNode",
481+
"description": "Enables console to refer to the node with given id via $0 (see Command Line API for more details).",
482+
"parameters": [
483+
{ "name": "nodeId", "$ref": "NodeId", "description": "DOM node id to be accessible by means of $0 command line API." }
484+
]
478485
}
479486
],
480487
"events": [

‎Source/WebCore/ChangeLog

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2017-09-25 Devin Rousso <[email protected]>
2+
3+
Web Inspector: move Console.addInspectedNode to DOM.setInspectedNode
4+
https://bugs.webkit.org/show_bug.cgi?id=176827
5+
6+
Reviewed by Joseph Pecoraro.
7+
8+
Tests: http/tests/inspector/dom/cross-domain-inspected-node-access.html
9+
inspector/dom/setInspectedNode.html
10+
11+
* inspector/InspectorDOMAgent.h:
12+
* inspector/InspectorDOMAgent.cpp:
13+
(WebCore::InspectorDOMAgent::setInspectedNode):
14+
15+
* inspector/PageConsoleAgent.h:
16+
* inspector/PageConsoleAgent.cpp:
17+
(WebCore::PageConsoleAgent::addInspectedNode): Deleted.
18+
19+
* inspector/WorkerConsoleAgent.h:
20+
* inspector/WorkerConsoleAgent.cpp:
21+
(WebCore::WorkerConsoleAgent::addInspectedNode): Deleted.
22+
123
2017-09-25 Sam Weinig <[email protected]>
224

325
[WebIDL] Factor out IsExceptionOr check from toJS/toJSNewlyCreated signature

‎Source/WebCore/inspector/InspectorDOMAgent.cpp

+29
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "CSSStyleRule.h"
4343
#include "CSSStyleSheet.h"
4444
#include "CharacterData.h"
45+
#include "CommandLineAPIHost.h"
4546
#include "ContainerNode.h"
4647
#include "Cookie.h"
4748
#include "CookieJar.h"
@@ -92,6 +93,7 @@
9293
#include "Text.h"
9394
#include "TextNodeTraversal.h"
9495
#include "Timer.h"
96+
#include "WebInjectedScriptManager.h"
9597
#include "XPathResult.h"
9698
#include "markup.h"
9799
#include <inspector/IdentifiersFactory.h>
@@ -200,6 +202,21 @@ void RevalidateStyleAttributeTask::timerFired()
200202
m_elements.clear();
201203
}
202204

205+
class InspectableNode final : public CommandLineAPIHost::InspectableObject {
206+
public:
207+
explicit InspectableNode(Node* node)
208+
: m_node(node)
209+
{
210+
}
211+
212+
JSC::JSValue get(JSC::ExecState& state) final
213+
{
214+
return InspectorDOMAgent::nodeAsScriptValue(state, m_node.get());
215+
}
216+
private:
217+
RefPtr<Node> m_node;
218+
};
219+
203220
String InspectorDOMAgent::toErrorString(ExceptionCode ec)
204221
{
205222
return ec ? String(DOMException::name(ec)) : emptyString();
@@ -1255,6 +1272,18 @@ void InspectorDOMAgent::focus(ErrorString& errorString, int nodeId)
12551272
element->focus();
12561273
}
12571274

1275+
void InspectorDOMAgent::setInspectedNode(ErrorString& errorString, int nodeId)
1276+
{
1277+
Node* node = nodeForId(nodeId);
1278+
if (!node || node->isInUserAgentShadowTree()) {
1279+
errorString = ASCIILiteral("No node with given id found");
1280+
return;
1281+
}
1282+
1283+
if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).commandLineAPIHost())
1284+
commandLineAPIHost->addInspectedObject(std::make_unique<InspectableNode>(node));
1285+
}
1286+
12581287
void InspectorDOMAgent::resolveNode(ErrorString& errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
12591288
{
12601289
String objectGroupName = objectGroup ? *objectGroup : emptyString();

‎Source/WebCore/inspector/InspectorDOMAgent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ class InspectorDOMAgent final : public InspectorAgentBase, public Inspector::DOM
141141
void highlightNode(ErrorString&, const Inspector::InspectorObject& highlightConfig, const int* const nodeId, const String* const objectId) override;
142142
void highlightNodeList(ErrorString&, const Inspector::InspectorArray& nodeIds, const Inspector::InspectorObject& highlightConfig) override;
143143
void highlightFrame(ErrorString&, const String& frameId, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor) override;
144-
145144
void moveTo(ErrorString&, int nodeId, int targetNodeId, const int* const anchorNodeId, int* newNodeId) override;
146145
void undo(ErrorString&) override;
147146
void redo(ErrorString&) override;
148147
void markUndoableState(ErrorString&) override;
149148
void focus(ErrorString&, int nodeId) override;
149+
void setInspectedNode(ErrorString&, int nodeId) override;
150150

151151
void getEventListeners(Node*, Vector<EventListenerInfo>& listenersArray, bool includeAncestors);
152152

‎Source/WebCore/inspector/PageConsoleAgent.cpp

-23
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,4 @@ void PageConsoleAgent::clearMessages(ErrorString& errorString)
5454
WebConsoleAgent::clearMessages(errorString);
5555
}
5656

57-
class InspectableNode final : public CommandLineAPIHost::InspectableObject {
58-
public:
59-
explicit InspectableNode(Node* node) : m_node(node) { }
60-
JSC::JSValue get(JSC::ExecState& state) final
61-
{
62-
return InspectorDOMAgent::nodeAsScriptValue(state, m_node.get());
63-
}
64-
private:
65-
RefPtr<Node> m_node;
66-
};
67-
68-
void PageConsoleAgent::addInspectedNode(ErrorString& errorString, int nodeId)
69-
{
70-
Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
71-
if (!node || node->isInUserAgentShadowTree()) {
72-
errorString = ASCIILiteral("nodeId is not valid");
73-
return;
74-
}
75-
76-
if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).commandLineAPIHost())
77-
commandLineAPIHost->addInspectedObject(std::make_unique<InspectableNode>(node));
78-
}
79-
8057
} // namespace WebCore

‎Source/WebCore/inspector/PageConsoleAgent.h

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class PageConsoleAgent final : public WebConsoleAgent {
4747

4848
private:
4949
void clearMessages(ErrorString&) override;
50-
void addInspectedNode(ErrorString&, int nodeId) override;
5150

5251
InspectorDOMAgent* m_inspectorDOMAgent;
5352
};

‎Source/WebCore/inspector/WorkerConsoleAgent.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,4 @@ WorkerConsoleAgent::WorkerConsoleAgent(WorkerAgentContext& context, InspectorHea
3535
{
3636
}
3737

38-
void WorkerConsoleAgent::addInspectedNode(ErrorString& errorString, int)
39-
{
40-
errorString = ASCIILiteral("Unsupported for Workers.");
41-
}
42-
4338
} // namespace WebCore

‎Source/WebCore/inspector/WorkerConsoleAgent.h

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ class WorkerConsoleAgent final : public WebConsoleAgent {
3636
public:
3737
WorkerConsoleAgent(WorkerAgentContext&, Inspector::InspectorHeapAgent*);
3838
~WorkerConsoleAgent() { }
39-
40-
private:
41-
void addInspectedNode(ErrorString&, int nodeId) override;
4239
};
4340

4441
} // namespace WebCore

‎Source/WebInspectorUI/ChangeLog

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2017-09-25 Devin Rousso <[email protected]>
2+
3+
Web Inspector: move Console.addInspectedNode to DOM.setInspectedNode
4+
https://bugs.webkit.org/show_bug.cgi?id=176827
5+
6+
Reviewed by Joseph Pecoraro.
7+
8+
* UserInterface/Controllers/DOMTreeManager.js:
9+
(WI.DOMTreeManager):
10+
(WI.DOMTreeManager.prototype.setInspectedNode):
11+
12+
* UserInterface/Views/DOMTreeContentView.js:
13+
(WI.DOMTreeContentView.prototype._selectedNodeDidChange):
14+
115
2017-09-25 Joseph Pecoraro <[email protected]>
216

317
Web Inspector: Add loading indicator next to resources in the Network Tab

0 commit comments

Comments
 (0)