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

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

Issue 2728543002: DevTools: refactor Common.Renderer for DOM nodes (Closed)
Patch Set: cl fb Created 3 years, 10 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 4e10451d802bff388cede7bb0e32fbeacb6a2c2a..9370305acea1ad69775d8e37effd700b396ff266 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js
@@ -598,29 +598,38 @@ 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();
+ if (remoteObject.isNode()) {
+ var domModel = SDK.DOMModel.fromTarget(remoteObject.target());
+ domModel.pushObjectAsNodeToFrontend(remoteObject, onNodeResolved.bind(this));
+ } else {
+ result.appendChild(this._formatParameterAsObject(remoteObject, false));
}
/**
+ * @param {?SDK.DOMNode} node
* @this {Console.ConsoleViewMessage}
*/
- function failedToRender() {
- result.appendChild(this._formatParameterAsObject(object, false));
+ function onNodeResolved(node) {
+ if (!node) {
+ result.appendChild(this._formatParameterAsObject(remoteObject, false));
+ return result;
+ }
+ Common.Renderer.renderPromise(node).then(
+ rendererElement => {
+ result.appendChild(rendererElement);
+ this._formattedParameterAsNodeForTest();
+ },
+ () => {
+ result.appendChild(this._formatParameterAsObject(remoteObject, false));
pfeldman 2017/03/02 22:04:51 Don't use silent catch, it is better to break than
chenwilliam 2017/03/13 23:25:26 Done.
+ });
}
+ return result;
}
_formattedParameterAsNodeForTest() {

Powered by Google App Engine
This is Rietveld 408576698