Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js

Issue 2728543002: DevTools: refactor Common.Renderer for DOM nodes (Closed)
Patch Set: fixup Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js
index 9d89be4e5929e2a7bd95748ade3003659a99d6af..8aff716ba78c3e5ba2622ad8cf8f3943f197d425 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js
@@ -486,7 +486,7 @@ Console.ConsoleViewMessage = class {
element = this._formatParameterAsObject(output, includePreview);
break;
case 'node':
- element = this._formatParameterAsNode(output);
+ element = output.isNode() ? this._formatParameterAsNode(output) : this._formatParameterAsObject(output, false);
break;
case 'string':
element = this._formatParameterAsString(output);
@@ -598,29 +598,27 @@ Console.ConsoleViewMessage = class {
}
/**
- * @param {!SDK.RemoteObject} object
+ * @param {!SDK.RemoteObject} remoteObject
* @return {!Element}
*/
- _formatParameterAsNode(object) {
+ _formatParameterAsNode(remoteObject) {
var result = createElement('span');
- Common.Renderer.renderPromise(object).then(appendRenderer.bind(this), failedToRender.bind(this));
- return result;
- /**
- * @param {!Element} rendererElement
- * @this {Console.ConsoleViewMessage}
- */
- function appendRenderer(rendererElement) {
- result.appendChild(rendererElement);
- this._formattedParameterAsNodeForTest();
- }
+ var domModel = SDK.DOMModel.fromTarget(remoteObject.runtimeModel().target());
+ if (!domModel)
+ return result;
+ domModel.pushObjectAsNodeToFrontend(remoteObject).then(node => {
+ if (!node) {
+ result.appendChild(this._formatParameterAsObject(remoteObject, false));
+ return;
+ }
+ Common.Renderer.renderPromise(node).then(rendererElement => {
+ result.appendChild(rendererElement);
+ this._formattedParameterAsNodeForTest();
+ });
+ });
- /**
- * @this {Console.ConsoleViewMessage}
- */
- function failedToRender() {
- result.appendChild(this._formatParameterAsObject(object, false));
- }
+ return result;
}
_formattedParameterAsNodeForTest() {

Powered by Google App Engine
This is Rietveld 408576698