Merge DevTools Refactor CL to Blink36

Source/devtools/front_end/sdk/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 68 matching lines @@
     /**
      * @param {boolean} accessorPropertiesOnly
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
      */
     getAllProperties: function(accessorPropertiesOnly, callback)
     {
         throw "Not implemented";
     },
 
     /**
-     * @param {function(this:Object, ...)} functionDeclaration
+     * @param {function(this:Object, ...)|!String} functionDeclaration
      * @param {!Array.<!RuntimeAgent.CallArgument>=} args
      * @param {function(?WebInspector.RemoteObject, boolean=)=} callback
      */
     callFunction: function(functionDeclaration, args, callback)
     {
         throw "Not implemented";
     },
 
     /**
-     * @param {function(this:Object)} functionDeclaration
+     * @param {function(this:Object)|!String} functionDeclaration
      * @param {!Array.<!RuntimeAgent.CallArgument>|undefined} args
      * @param {function(*)} callback
      */
     callFunctionJSON: function(functionDeclaration, args, callback)
     {
         throw "Not implemented";
     },
 
     /**
      * @return {!WebInspector.Target}
@@ skipping 15 matching lines @@
     {
         WebInspector.Revealer.reveal(this);
     },
 
     /**
      * @param {function(?DebuggerAgent.FunctionDetails)} callback
      */
     functionDetails: function(callback)
     {
         callback(null);
-    }
+    },
+
+    /** @return {string|undefined} */
+    get language()
+    {
+        throw "Not implemented";
+    },
 }
 
 /**
  * @param {*} value
  * @return {!WebInspector.RemoteObject}
  */
 WebInspector.RemoteObject.fromLocalObject = function(value)
 {
     return new WebInspector.LocalJSONObject(value);
 }
@@ skipping 46 matching lines @@
  * @constructor
  * @extends {WebInspector.RemoteObject}
  * @param {!WebInspector.Target} target
  * @param {string|undefined} objectId
  * @param {string} type
  * @param {string|undefined} subtype
  * @param {*} value
  * @param {string=} description
  * @param {!RuntimeAgent.ObjectPreview=} preview
  */
-WebInspector.RemoteObjectImpl = function(target, objectId, type, subtype, value, description, preview)
+WebInspector.RemoteObjectImpl = function(target, objectId, type, subtype, value, description, preview, language)
 {
     WebInspector.RemoteObject.call(this);
 
     this._target = target;
     this._runtimeAgent = target.runtimeAgent();
     this._domModel = target.domModel;
 
     this._type = type;
     this._subtype = subtype;
+    this._language = language;
     if (objectId) {
         // handle
         this._objectId = objectId;
         this._description = description;
         this._hasChildren = true;
         this._preview = preview;
+        if (value !== undefined)
+            this.value = value;
     } else {
         // Primitive or null object.
         console.assert(type !== "object" || value === null);
         this._description = description || (value + "");
         this._hasChildren = false;
         // Handle special numbers: NaN, Infinity, -Infinity, -0.
         if (type === "number" && typeof value !== "number")
             this.value = Number(value);
         else
             this.value = value;
@@ skipping 30 matching lines @@
     {
         return this._hasChildren;
     },
 
     /** @return {!RuntimeAgent.ObjectPreview|undefined} */
     get preview()
     {
         return this._preview;
     },
 
+    /** @return {string|undefined} */
+    get language()
+    {
+        return this._language;
+    },
+
     /**
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
      */
     getOwnProperties: function(callback)
     {
         this.doGetProperties(true, false, callback);
     },
 
     /**
      * @param {boolean} accessorPropertiesOnly
      * @param {function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
      */
     getAllProperties: function(accessorPropertiesOnly, callback)
     {
         this.doGetProperties(false, accessorPropertiesOnly, callback);
     },
 
     /**
      * @param {!Array.<string>} propertyPath
      * @param {function(?WebInspector.RemoteObject, boolean=)} callback
      */
     getProperty: function(propertyPath, callback)
     {
         /**
          * @param {string} arrayStr
          * @suppressReceiverCheck
          * @this {Object}
          */
-        function remoteFunction(arrayStr)
+        function mycallback(error, result, wasThrown)
         {
-            var result = this;
-            var properties = JSON.parse(arrayStr);
-            for (var i = 0, n = properties.length; i < n; ++i)
-                result = result[properties[i]];
-            return result;
+            if (error)
+                callback(null, false);
+            else
+                callback(this.target().runtimeModel.createRemoteObject(result), wasThrown);
         }
 
-        var args = [{ value: JSON.stringify(propertyPath) }];
-        this.callFunction(remoteFunction, args, callback);
+        this._runtimeAgent.getProperty(this._objectId, propertyPath, mycallback.bind(this));
     },
 
     /**
      * @param {boolean} ownProperties
      * @param {boolean} accessorPropertiesOnly
      * @param {?function(?Array.<!WebInspector.RemoteObjectProperty>, ?Array.<!WebInspector.RemoteObjectProperty>)} callback
      */
     doGetProperties: function(ownProperties, accessorPropertiesOnly, callback)
     {
         if (!this._objectId) {
@@ skipping 124 matching lines @@
     {
         this._domModel.highlightDOMNode(undefined, undefined, this._objectId);
     },
 
     hideDOMNodeHighlight: function()
     {
         this._domModel.hideDOMNodeHighlight();
     },
 
     /**
-     * @param {function(this:Object, ...)} functionDeclaration
+     * @param {function(this:Object, ...)|!String} functionDeclaration
      * @param {!Array.<!RuntimeAgent.CallArgument>=} args
      * @param {function(?WebInspector.RemoteObject, boolean=)=} callback
      */
     callFunction: function(functionDeclaration, args, callback)
     {
         /**
          * @param {?Protocol.Error} error
          * @param {!RuntimeAgent.RemoteObject} result
          * @param {boolean=} wasThrown
          * @this {WebInspector.RemoteObjectImpl}
          */
         function mycallback(error, result, wasThrown)
         {
             if (!callback)
                 return;
             if (error)
                 callback(null, false);
             else
                 callback(this.target().runtimeModel.createRemoteObject(result), wasThrown);
         }
 
         this._runtimeAgent.callFunctionOn(this._objectId, functionDeclaration.toString(), args, true, undefined, undefined, mycallback.bind(this));
     },
 
     /**
-     * @param {function(this:Object)} functionDeclaration
+     * @param {function(this:Object)|!String} functionDeclaration
      * @param {!Array.<!RuntimeAgent.CallArgument>|undefined} args
      * @param {function(*)} callback
      */
     callFunctionJSON: function(functionDeclaration, args, callback)
     {
         /**
          * @param {?Protocol.Error} error
          * @param {!RuntimeAgent.RemoteObject} result
          * @param {boolean=} wasThrown
          */
@@ skipping 430 matching lines @@
 
     /**
      * @return {number}
      */
     arrayLength: function()
     {
         return this._value instanceof Array ? this._value.length : 0;
     },
 
     /**
-     * @param {function(this:Object, ...)} functionDeclaration
+     * @param {function(this:Object, ...)|!String} functionDeclaration
      * @param {!Array.<!RuntimeAgent.CallArgument>=} args
      * @param {function(?WebInspector.RemoteObject, boolean=)=} callback
      */
     callFunction: function(functionDeclaration, args, callback)
     {
         var target = /** @type {?Object} */ (this._value);
         var rawArgs = args ? args.map(function(arg) {return arg.value;}) : [];
 
         var result;
         var wasThrown = false;
         try {
             result = functionDeclaration.apply(target, rawArgs);
         } catch (e) {
             wasThrown = true;
         }
 
         if (!callback)
             return;
         callback(WebInspector.RemoteObject.fromLocalObject(result), wasThrown);
     },
 
     /**
-     * @param {function(this:Object)} functionDeclaration
+     * @param {function(this:Object)|!String} functionDeclaration
      * @param {!Array.<!RuntimeAgent.CallArgument>|undefined} args
      * @param {function(*)} callback
      */
     callFunctionJSON: function(functionDeclaration, args, callback)
     {
         var target = /** @type {?Object} */ (this._value);
         var rawArgs = args ? args.map(function(arg) {return arg.value;}) : [];
 
         var result;
         try {
             result = functionDeclaration.apply(target, rawArgs);
         } catch (e) {
             result = null;
         }
 
         callback(result);
     },
 
     __proto__: WebInspector.RemoteObject.prototype
 }