Merge 134053 - Web Inspector: wrong output for empty object {}

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

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 306 matching lines @@
                 titleElement.createChild("span", "name").textContent = property.name;
                 titleElement.createTextChild(": ");
             }
 
             var span = titleElement.createChild("span", "console-formatted-" + property.type);
             if (property.type === "object") {
                 if (property.subtype === "node")
                     span.addStyleClass("console-formatted-preview-node");
                 else if (property.subtype === "regexp")
                     span.addStyleClass("console-formatted-string");
-            }
-            span.textContent = property.value;
+                span.textContent = property.value;
+            } else if (property.type === "function")
+                span.textContent = "function";
+            else
+                span.textContent = property.value;
         }
         if (preview.overflow)
             titleElement.createChild("span").textContent = "\u2026";
         titleElement.createTextChild(isArray ? "]" : "}");
         return preview.lossless;
     },
 
     _formatParameterAsNode: function(object, elem)
     {
         function printNode(nodeId)
@@ skipping 400 matching lines @@
     /**
      * @return {WebInspector.ConsoleMessage}
      */
     clone: function()
     {
         return WebInspector.ConsoleMessage.create(this.source, this.level, this._messageText, this.type, this.url, this.line, this.repeatCount, this._parameters, this._stackTrace, this._request ? this._request.requestId : undefined, this._isOutdated);
     },
 
     __proto__: WebInspector.ConsoleMessage.prototype
 }