Merge 144161

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 1001 matching lines @@
         case WebInspector.TimelineModel.RecordType.Time:
         case WebInspector.TimelineModel.RecordType.TimeEnd:
         case WebInspector.TimelineModel.RecordType.TimeStamp:
             details = this.data["message"];
             break;
         default:
             details = this._linkifyScriptLocation() || this._linkifyTopCallFrame() || null;
             break;
         }
 
-        if (typeof details === "string")
-            return this._createSpanWithText(details);
+        if (details && !(details instanceof Node))
+            return this._createSpanWithText("" + details);
 
         return details ? details : null;
     },
 
     /**
      * @param {string} url
      * @param {number} lineNumber
      * @param {number=} columnNumber
      */
     _linkifyLocation: function(url, lineNumber, columnNumber)
@@ skipping 14 matching lines @@
     _linkifyTopCallFrame: function(defaultValue)
     {
         if (this.stackTrace)
             return this._linkifyCallFrame(this.stackTrace[0]);
         if (this.callSiteStackTrace)
             return this._linkifyCallFrame(this.callSiteStackTrace[0]);
         return defaultValue;
     },
 
     /**
-     * @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)
     {
         this._aggregatedStats = {};
         for (var category in categories)
             this._aggregatedStats[category] = 0;
         this._cpuTime = this._selfTime;
 
         for (var index = this._children.length; index; --index) {
@@ skipping 249 matching lines @@
     },
 
     set hidden(hidden)
     {
         this._hidden = hidden;
         this.dispatchEventToListeners(WebInspector.TimelineCategory.Events.VisibilityChanged, this);
     },
 
     __proto__: WebInspector.Object.prototype
 }