[DevTools] Add additional accessor check in InjectedScriptSource.js

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 433 matching lines @@
     {
         var propertyProcessed = { __proto__: null };
 
         /**
          * @param {?Object} o
          * @param {!Iterable<string|symbol|number>|!Array<string|number|symbol>} properties
          */
         function* process(o, properties)
         {
             for (var property of properties) {
-                var name;
-                if (isSymbol(property))
-                    name = /** @type {string} */ (injectedScript._describe(property));
-                else
-                    name = typeof property === "number" ? ("" + property) : /** @type {string} */(property);
-
+                var name = isSymbol(property) ? (/** @type {string} */ (injectedScript._describe(property))) : "" + property;
                 if (propertyProcessed[property])
                     continue;
 
                 try {
                     propertyProcessed[property] = true;
                     var descriptor = nullifyObjectProto(InjectedScriptHost.suppressWarningsAndCallFunction(Object.getOwnPropertyDescriptor, Object, [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) && !doesAttributeHaveObservableSideEffectOnGet(object, name)) {
-                            descriptor.value = InjectedScriptHost.suppressWarningsAndCallFunction(function(attribute) { return this[attribute]; }, 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 };
-                            if (o === object)
-                                descriptor.isOwn = true;
-                            yield descriptor;
-                        } catch (e) {
-                            // Silent catch.
-                        }
+                    var isAccessor = "get" in descriptor || "set" in descriptor;
+                    if (accessorPropertiesOnly && !isAccessor)
                         continue;
+
+                    var isGetterFunction = typeof descriptor.get === "function";
+                    var canFormatAccessorsAsProperty = !(isGetterFunction ? InjectedScriptHost.hasFunctionSource(descriptor.get) : true);

[lushnikov, 2016/05/06 17:58:56]

can we inline "!"

[kozy, 2016/05/06 18:02:19]

Done.

+                    if (isAccessor && name !== "__proto__" && canFormatAccessorsAsProperty && !doesAttributeHaveObservableSideEffectOnGet(object, name)) {
+                        descriptor.value = InjectedScriptHost.suppressWarningsAndCallFunction(function(attribute) { return this[attribute]; }, object, [property]);
+                        descriptor.isOwn = true;
+                        delete descriptor.get;
+                        delete descriptor.set;
                     }
                 } catch (e) {
                     if (accessorPropertiesOnly)
                         continue;
                     var descriptor = { __proto__: null };
                     descriptor.value = e;
                     descriptor.wasThrown = true;
                 }
 
                 descriptor.name = name;
@@ skipping 802 matching lines @@
 /**
  * @param {!Event} event
  */
 CommandLineAPIImpl._logEvent = function(event)
 {
     inspectedGlobalObject.console.log(event.type, event);
 }
 
 return injectedScript;
 })