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

Bug 1120613 - Handle functions and objects that claim to be functions as well. r=billm

Browse Source
This commit is contained in:
Blake Kaplan 2015-01-21 16:14:20 -08:00
parent 582425cdbd
commit 874afdcae9
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/components/addoncompat/Prefetcher.jsm
View File

@ -84,9 +84,16 @@ let PrefetcherRules = {};
const PREF_PREFETCHING_ENABLED = "extensions.interposition.prefetching";
function isPrimitive(v) {
if (!v)
return true;
let type = typeof(v);
return type !== "object" && type !== "function";
}
function objAddr(obj)
{
if (obj && typeof(obj) == "object") {
if (!isPrimitive(obj)) {
return String(obj) + "[" + Cu.getJSTestingFunctions().objectAddress(obj) + "]";
}
return String(obj);
@ -146,7 +153,7 @@ PropertyOp.prototype.addObject = function(database, obj)
logPrefetch("prop", obj, this.prop, propValue);
database.cache(this.index, obj, has, propValue);
if (has && typeof(propValue) == "object" && propValue && this.outputTable) {
if (has && !isPrimitive(propValue) && this.outputTable) {
database.add(this.outputTable, propValue);
}
}
@ -184,7 +191,7 @@ MethodOp.prototype.addObject = function(database, obj)
logPrefetch("method", obj, this.method + "(" + this.args + ")", result);
database.cache(this.index, obj, result);
if (result && typeof(result) == "object" && this.outputTable) {
if (!isPrimitive(result) && this.outputTable) {
database.add(this.outputTable, result);
}
}
@ -239,7 +246,7 @@ CollectionOp.prototype.addObject = function(database, obj)
database.cache(this.index, obj, ...elements);
for (let i = 0; i < elements.length; i++) {
if (elements[i] && typeof(elements[i]) == "object" && this.outputTable) {
if (!isPrimitive(elements[i]) && this.outputTable) {
database.add(this.outputTable, elements[i]);
}
}
@ -395,7 +402,7 @@ let Prefetcher = {
let cpows = [];
for (let item of db.cached) {
item = item.map((elt) => {
if (elt && typeof(elt) == "object") {
if (!isPrimitive(elt)) {
if (!cpowIndexes.has(elt)) {
let index = cpows.length;
cpows.push(elt);
@ -423,7 +430,7 @@ let Prefetcher = {
// Replace anything of the form {cpow: <index>} with the actual
// object in |cpows|.
item = item.map((elt) => {
if (elt && typeof(elt) == "object") {
if (!isPrimitive(elt)) {
return cpows[elt.cpow];
}
return elt;