Merge 144161

Source/WebCore/inspector/front-end/TimelinePresentationModel.js

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)