[DevTools] Removed InjectedScriptHost.eval and InjectedScriptHost.objectForId

third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 388 matching lines @@
      * @param {!Object|symbol} object
      * @param {string=} objectGroupName
      * @return {string}
      */
     _bind: function(object, objectGroupName)
     {
         var id = InjectedScriptHost.bind(object, objectGroupName || "");
         return "{\"injectedScriptId\":" + injectedScriptId + ",\"id\":" + id + "}";
     },
 
-    /**
-     * @param {string} objectId
-     * @return {!Object}
-     */
-    _parseObjectId: function(objectId)
-    {
-        return nullifyObjectProto(/** @type {!Object} */ (InjectedScriptHost.eval("(" + objectId + ")")));
-    },
-
     clearLastEvaluationResult: function()
     {
         delete this._lastResult;
     },
 
     /**
      * @param {*} result
      */
     setLastEvaluationResult: function(result)
     {
         this._lastResult = result;
     },
 
     /**
-     * @param {string} objectId
+     * @param {!Object} object
+     * @param {string} objectGroupName
      * @param {boolean} ownProperties
      * @param {boolean} accessorPropertiesOnly
      * @param {boolean} generatePreview
-     * @return {!Array.<!RuntimeAgent.PropertyDescriptor>|boolean}
+     * @return {!Array<!RuntimeAgent.PropertyDescriptor>|boolean}
      */
-    getProperties: function(objectId, ownProperties, accessorPropertiesOnly, generatePreview)
+    getProperties: function(object, objectGroupName, ownProperties, accessorPropertiesOnly, generatePreview)
     {
-        var parsedObjectId = this._parseObjectId(objectId);
-        var object = this._objectForId(parsedObjectId);
-        var objectGroupName = InjectedScriptHost.idToObjectGroupName(parsedObjectId.id);

[dgozman, 2016/03/22 00:51:44]

Kill this one as well.

[kozy, 2016/03/22 01:07:59]

Done.

-
-        if (!this._isDefined(object) || isSymbol(object))
-            return false;
-        object = /** @type {!Object} */ (object);
         var descriptors = [];
         var iter = this._propertyDescriptors(object, ownProperties, accessorPropertiesOnly, undefined);
         // Go over properties, wrap object values.
         for (var descriptor of iter) {
             if ("get" in descriptor)
                 descriptor.get = this._wrapObject(descriptor.get, objectGroupName);
             if ("set" in descriptor)
                 descriptor.set = this._wrapObject(descriptor.set, objectGroupName);
             if ("value" in descriptor)
                 descriptor.value = this._wrapObject(descriptor.value, objectGroupName, false, generatePreview);
@@ skipping 209 matching lines @@
          * @this {InjectedScript}
          */
         function wrap(object, forceValueType, generatePreview, columnNames, isTable, customObjectConfig)
         {
             return this._wrapObject(object, objectGroup, forceValueType, generatePreview, columnNames, isTable, false, customObjectConfig);
         }
         return { bindRemoteObject: bind(wrap, this), __proto__: null};
     },
 
     /**
-     * @param {!Object} objectId
-     * @return {!Object|symbol|undefined}
-     */
-    _objectForId: function(objectId)
-    {
-        return objectId.injectedScriptId === injectedScriptId ? /** @type{!Object|symbol|undefined} */ (InjectedScriptHost.objectForId(objectId.id)) : void 0;
-    },
-
-    /**
      * @param {*} object
      * @return {boolean}
      */
     _isDefined: function(object)
     {
         return !!object || this._isHTMLAllCollection(object);
     },
 
     /**
      * @param {*} object
@@ skipping 870 matching lines @@
      */
     _logEvent: function(event)
     {
         inspectedGlobalObject.console.log(event.type, event);
     }
 }
 
 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
 return injectedScript;
 })