summaryrefslogtreecommitdiff
path: root/deps/v8/src/inspector/injected-script-source.js
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/inspector/injected-script-source.js')
-rw-r--r--deps/v8/src/inspector/injected-script-source.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/deps/v8/src/inspector/injected-script-source.js b/deps/v8/src/inspector/injected-script-source.js
index 5e5302fbbe..ea0d871248 100644
--- a/deps/v8/src/inspector/injected-script-source.js
+++ b/deps/v8/src/inspector/injected-script-source.js
@@ -401,9 +401,12 @@ InjectedScript.prototype = {
var isAccessorProperty = descriptor && ("get" in descriptor || "set" in descriptor);
if (accessorPropertiesOnly && !isAccessorProperty)
continue;
- if (descriptor && "get" in descriptor && "set" in descriptor && name !== "__proto__" &&
+ // Special case for Symbol.prototype.description where the receiver of the getter is not an actual object.
+ // Should only occur for nested previews.
+ var isSymbolDescription = isSymbol(object) && name === 'description';
+ if (isSymbolDescription || (descriptor && "get" in descriptor && "set" in descriptor && name !== "__proto__" &&
InjectedScriptHost.formatAccessorsAsProperties(object, descriptor.get) &&
- !doesAttributeHaveObservableSideEffectOnGet(object, name)) {
+ !doesAttributeHaveObservableSideEffectOnGet(object, name))) {
descriptor.value = object[property];
descriptor.isOwn = true;
delete descriptor.get;
@@ -594,6 +597,9 @@ InjectedScript.prototype = {
return toString(obj);
if (subtype === "node") {
+ // We should warmup blink dom binding before calling anything,
+ // see (crbug.com/827585) for details.
+ InjectedScriptHost.getOwnPropertyDescriptor(/** @type {!Object} */(obj), "nodeName");
var description = "";
var nodeName = InjectedScriptHost.getProperty(obj, "nodeName");
if (nodeName) {