diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/v8/src/inspector/injected-script-source.js | |
parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/v8/src/inspector/injected-script-source.js')
-rw-r--r-- | chromium/v8/src/inspector/injected-script-source.js | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/chromium/v8/src/inspector/injected-script-source.js b/chromium/v8/src/inspector/injected-script-source.js index dd9067ca96b..0849d44202e 100644 --- a/chromium/v8/src/inspector/injected-script-source.js +++ b/chromium/v8/src/inspector/injected-script-source.js @@ -460,6 +460,10 @@ InjectedScript.prototype = { if (InjectedScriptHost.subtype(o) === "proxy") continue; + var typedArrays = subtype === "arraybuffer" ? InjectedScriptHost.typedArrayProperties(o) || [] : []; + for (var i = 0; i < typedArrays.length; i += 2) + addPropertyIfNeeded(descriptors, { name: typedArrays[i], value: typedArrays[i + 1], isOwn: true, enumerable: false, configurable: false, __proto__: null }); + try { if (skipGetOwnPropertyNames && o === object) { if (!process(o, undefined, o.length)) @@ -586,15 +590,21 @@ InjectedScript.prototype = { if (subtype === "node") { var description = ""; - if (obj.nodeName) - description = obj.nodeName.toLowerCase(); - else if (obj.constructor) - description = obj.constructor.name.toLowerCase(); + var nodeName = InjectedScriptHost.getProperty(obj, "nodeName"); + if (nodeName) { + description = nodeName.toLowerCase(); + } else { + var constructor = InjectedScriptHost.getProperty(obj, "constructor"); + if (constructor) + description = (InjectedScriptHost.getProperty(constructor, "name") || "").toLowerCase(); + } - switch (obj.nodeType) { + var nodeType = InjectedScriptHost.getProperty(obj, "nodeType"); + switch (nodeType) { case 1 /* Node.ELEMENT_NODE */: - description += obj.id ? "#" + obj.id : ""; - var className = obj.className; + var id = InjectedScriptHost.getProperty(obj, "id"); + description += id ? "#" + id : ""; + var className = InjectedScriptHost.getProperty(obj, "className"); description += (className && typeof className === "string") ? "." + className.trim().replace(/\s+/g, ".") : ""; break; case 10 /*Node.DOCUMENT_TYPE_NODE */: @@ -929,6 +939,10 @@ InjectedScript.RemoteObject.prototype = { if ((subtype === "map" || subtype === "set") && descriptor.name === "size") return true; + // Ignore ArrayBuffer previews + if (subtype === 'arraybuffer' && (descriptor.name === "[[Int8Array]]" || descriptor.name === "[[Uint8Array]]" || descriptor.name === "[[Int16Array]]" || descriptor.name === "[[Int32Array]]")) + return true; + // Never preview prototype properties. if (!descriptor.isOwn) return true; |