Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 856067 - Fix Object Actor Previews. r=past

Browse Source
This commit is contained in:
Bobby Holley 2014-07-14 10:09:06 -07:00
parent 393cf7b755
commit 22be9ff3ec
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/devtools/server/actors/script.js
View File

@ -3699,18 +3699,21 @@ DebuggerServer.ObjectActorPreviewers = {
let raw = obj.unsafeDereference();
let entries = aGrip.preview.entries = [];
// We don't have Xrays to Iterators, so .entries returns [key, value]
// Arrays that live in content. But since we have Array Xrays,
// we'll deny access depending on the nature of those values. So we need
// to waive Xrays on those tuples (and re-apply them on the underlying
// values) until we fix bug 1023984.
// Iterating over a Map via .entries goes through various intermediate
// objects - an Iterator object, then a 2-element Array object, then the
// actual values we care about. We don't have Xrays to Iterator objects,
// so we get Opaque wrappers for them. And even though we have Xrays to
// Arrays, the semantics often deny access to the entires based on the
// nature of the values. So we need waive Xrays for the iterator object
// and the tupes, and then re-apply them on the underlying values until
// we fix bug 1023984.
//
// Even then though, we might want to continue waiving Xrays here for the
// same reason we do so for Arrays above - this filtering behavior is likely
// to be more confusing than beneficial in the case of Object previews.
for (let keyValuePair of Map.prototype.entries.call(raw)) {
let key = Cu.unwaiveXrays(Cu.waiveXrays(keyValuePair)[0]);
let value = Cu.unwaiveXrays(Cu.waiveXrays(keyValuePair)[1]);
for (let keyValuePair of Cu.waiveXrays(Map.prototype.entries.call(raw))) {
let key = Cu.unwaiveXrays(keyValuePair[0]);
let value = Cu.unwaiveXrays(keyValuePair[1]);
key = makeDebuggeeValueIfNeeded(obj, key);
value = makeDebuggeeValueIfNeeded(obj, value);
entries.push([threadActor.createValueGrip(key),