Merge 86768 - 2011-05-18 Pavel Feldman <pfeldman@google.com>

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

 /*
  * Copyright (C) 2009 Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 107 matching lines @@
     },
 
     _getProperties: function(ignoreHasOwnProperty, callback)
     {
         if (!this._objectId) {
             callback([]);
             return;
         }
         function remoteObjectBinder(error, properties)
         {
-            if (error)
+            if (error) {
+                callback(null);
                 return;
+            }
             for (var i = 0; properties && i < properties.length; ++i)
                 properties[i].value = WebInspector.RemoteObject.fromPayload(properties[i].value);
             callback(properties);
         }
         RuntimeAgent.getProperties(this._objectId, !!ignoreHasOwnProperty, remoteObjectBinder);
     },
 
     setPropertyValue: function(name, value, callback)
     {
         if (!this._objectId) {
@@ skipping 121 matching lines @@
         if (!this._cachedChildren)
             this._cachedChildren = Object.keys(this._value).map(buildProperty.bind(this));
         return this._cachedChildren;
     },
 
     isError: function()
     {
         return false;
     }
 }