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

Unified Diff: Source/WebCore/inspector/front-end/TimelinePresentationModel.js

Issue 12389044: Merge 144161 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/inspector/front-end/TimelinePresentationModel.js
===================================================================
--- Source/WebCore/inspector/front-end/TimelinePresentationModel.js (revision 144417)
+++ Source/WebCore/inspector/front-end/TimelinePresentationModel.js (working copy)
@@ -1019,8 +1019,8 @@
break;
}
- if (typeof details === "string")
- return this._createSpanWithText(details);
+ if (details && !(details instanceof Node))
+ return this._createSpanWithText("" + details);
return details ? details : null;
},
@@ -1055,11 +1055,15 @@
},
/**
- * @param {string=} defaultValue
+ * @param {*=} defaultValue
+ * @return {Element|string}
*/
_linkifyScriptLocation: function(defaultValue)
{
- return this.scriptName ? this._linkifyLocation(this.scriptName, this.scriptLine, 0) : defaultValue;
+ if (this.scriptName)
+ return this._linkifyLocation(this.scriptName, this.scriptLine, 0);
+ else
+ return defaultValue ? "" + defaultValue : null;
},
calculateAggregatedStats: function(categories)
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698