[DevTools] Replace InjectedScriptHost.suppressWarningsAndCallFunction with hasOwnProperty.

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 97 matching lines @@
  * FireBug's array detection.
  * @param {*} obj
  * @return {boolean}
  */
 function isArrayLike(obj)
 {
     if (typeof obj !== "object")
         return false;
     try {
         if (typeof obj.splice === "function") {
-            if (!InjectedScriptHost.suppressWarningsAndCallFunction(Object.prototype.hasOwnProperty, obj, ["length"]))
+            if (!InjectedScriptHost.hasOwnProperty(/** @type {?Object} */ (obj), "length"))

[kozy, 2016/07/29 22:11:55]

Please align this type with externs. It's !Object there.

[dgozman, 2016/07/29 23:30:26]

Done.

                 return false;
             var len = obj.length;
             return typeof len === "number" && isUInt32(len);
         }
     } catch (e) {
     }
     return false;
 }
 
 /**
@@ skipping 34 matching lines @@
 domAttributesWithObservableSideEffectOnGet["Response"]["body"] = true;
 
 /**
  * @param {!Object} object
  * @param {string} attribute
  * @return {boolean}
  */
 function doesAttributeHaveObservableSideEffectOnGet(object, attribute)
 {
     for (var interfaceName in domAttributesWithObservableSideEffectOnGet) {
-        var isInstance = InjectedScriptHost.suppressWarningsAndCallFunction(function(object, interfaceName) {
-            return /* suppressBlacklist */ typeof inspectedGlobalObject[interfaceName] === "function" && object instanceof inspectedGlobalObject[interfaceName];
-        }, null, [object, interfaceName]);
-        if (isInstance) {
+        var interfaceFunction = inspectedGlobalObject[interfaceName];
+        var isInstance = typeof interfaceFunction === "function" && object instanceof interfaceFunction;
+        if (isInstance)
             return attribute in domAttributesWithObservableSideEffectOnGet[interfaceName];
-        }
     }
     return false;
 }
 
 /**
  * @constructor
  */
 var InjectedScript = function()
 {
 }
@@ skipping 201 matching lines @@
                 if (isSymbol(property))
                     name = /** @type {string} */ (injectedScript._describe(property));
                 else
                     name = typeof property === "number" ? ("" + property) : /** @type {string} */(property);
 
                 if (propertyProcessed[property])
                     continue;
 
                 try {
                     propertyProcessed[property] = true;
-                    var descriptor = nullifyObjectProto(InjectedScriptHost.suppressWarningsAndCallFunction(Object.getOwnPropertyDescriptor, Object, [o, property]));
+                    var descriptor = nullifyObjectProto(Object.getOwnPropertyDescriptor(o, property));
                     if (descriptor) {
                         if (accessorPropertiesOnly && !("get" in descriptor || "set" in descriptor))
                             continue;
                         if ("get" in descriptor && "set" in descriptor && name != "__proto__" && InjectedScriptHost.formatAccessorsAsProperties(object, descriptor.get) && !doesAttributeHaveObservableSideEffectOnGet(object, name)) {
-                            descriptor.value = InjectedScriptHost.suppressWarningsAndCallFunction(function(attribute) { return this[attribute]; }, object, [property]);
+                            descriptor.value = object[property];
                             descriptor.isOwn = true;
                             delete descriptor.get;
                             delete descriptor.set;
                         }
                     } else {
                         // Not all bindings provide proper descriptors. Fall back to the writable, configurable property.
                         if (accessorPropertiesOnly)
                             continue;
                         try {
                             descriptor = { name: name, value: o[property], writable: false, configurable: false, enumerable: false, __proto__: null };
@@ skipping 19 matching lines @@
                 if (isSymbol(property))
                     descriptor.symbol = property;
                 yield descriptor;
             }
         }
 
         if (propertyNamesOnly) {
             for (var i = 0; i < propertyNamesOnly.length; ++i) {
                 var name = propertyNamesOnly[i];
                 for (var o = object; this._isDefined(o); o = InjectedScriptHost.prototype(o)) {
-                    if (InjectedScriptHost.suppressWarningsAndCallFunction(Object.prototype.hasOwnProperty, o, [name])) {
+                    if (InjectedScriptHost.hasOwnProperty(o, name)) {
                         for (var descriptor of process(o, [name]))
                             yield descriptor;
                         break;
                     }
                     if (ownProperties)
                         break;
                 }
             }
             return;
         }
@@ skipping 161 matching lines @@
             if (typeof obj.length === "number")
                 className += "[" + obj.length + "]";
             return className;
         }
 
         if (typeof obj === "function")
             return toString(obj);
 
         if (isSymbol(obj)) {
             try {
-                return /** @type {string} */ (InjectedScriptHost.suppressWarningsAndCallFunction(Symbol.prototype.toString, obj)) || "Symbol";
+                return /** @type {string} */ (obj.toString()) || "Symbol";

[kozy, 2016/07/29 22:11:55]

please remove /** @type {string} */

[dgozman, 2016/07/29 23:30:26]

Done.

             } catch (e) {
                 return "Symbol";
             }
         }
 
         if (InjectedScriptHost.subtype(obj) === "error") {
             try {
                 var stack = obj.stack;
                 var message = obj.message && obj.message.length ? ": " + obj.message : "";
                 var firstCallFrame = /^\s+at\s/m.exec(stack);
@@ skipping 146 matching lines @@
         }
 
         /**
          * @suppressReceiverCheck
          * @param {*} object
          * @param {*=} customObjectConfig
          * @return {*}
          */
         function wrap(object, customObjectConfig)
         {
-            return InjectedScriptHost.suppressWarningsAndCallFunction(injectedScript._wrapObject, injectedScript, [ object, objectGroupName, false, false, null, false, false, customObjectConfig ]);
+            return injectedScript._wrapObject(object, objectGroupName, false, false, null, false, false, customObjectConfig);
         }
 
         try {
             var formatters = inspectedGlobalObject["devtoolsFormatters"];
             if (!formatters || !isArrayLike(formatters))
                 return null;
 
             for (var i = 0; i < formatters.length; ++i) {
                 try {
                     var formatted = formatters[i].header(object, customObjectConfig);
@@ skipping 247 matching lines @@
             return string.substr(0, leftHalf) + "\u2026" + string.substr(string.length - rightHalf, rightHalf);
         }
         return string.substr(0, maxLength) + "\u2026";
     },
 
     __proto__: null
 }
 
 return injectedScript;
 })