corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1165486 - Use JS::CompileForNonSyntacticScope in Gecko where we used to set polluted global scope. (r=bz, rs=bholley)

Browse Source
This commit is contained in:
Shu-yu Guo
2015-06-15 21:32:30 -07:00
parent 7eb742947a
commit fbbcb38408
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dom/base/nsFrameMessageManager.cpp
View File

@@ -1788,8 +1788,7 @@ nsMessageManagerScriptExecutor::TryCacheLoadAndCompileScript(
} }
} else { } else {
// We're going to run these against some non-global scope. // We're going to run these against some non-global scope.
options.setHasPollutedScope(true); if (!JS::CompileForNonSyntacticScope(cx, options, srcBuf, &script)) {
if (!JS::Compile(cx, options, srcBuf, &script)) {
return; return;
} }
} }

14
js/xpconnect/loader/mozJSSubScriptLoader.cpp
View File

@@ -146,8 +146,10 @@ PrepareScript(nsIURI* uri,
} }
if (!reuseGlobal) { if (!reuseGlobal) {
options.setHasPollutedScope(!JS_IsGlobalObject(targetObj)); if (JS_IsGlobalObject(targetObj))
JS::Compile(cx, options, srcBuf, script); JS::Compile(cx, options, srcBuf, script);
else
JS::CompileForNonSyntacticScope(cx, options, srcBuf, script);
} else { } else {
AutoObjectVector scopeChain(cx); AutoObjectVector scopeChain(cx);
if (!JS_IsGlobalObject(targetObj) && if (!JS_IsGlobalObject(targetObj) &&
@@ -162,9 +164,11 @@ PrepareScript(nsIURI* uri,
// We only use lazy source when no special encoding is specified because // We only use lazy source when no special encoding is specified because
// the lazy source loader doesn't know the encoding. // the lazy source loader doesn't know the encoding.
if (!reuseGlobal) { if (!reuseGlobal) {
options.setSourceIsLazy(true) options.setSourceIsLazy(true);
.setHasPollutedScope(!JS_IsGlobalObject(targetObj)); if (JS_IsGlobalObject(targetObj))
JS::Compile(cx, options, buf, len, script); JS::Compile(cx, options, buf, len, script);
else
JS::CompileForNonSyntacticScope(cx, options, buf, len, script);
} else { } else {
AutoObjectVector scopeChain(cx); AutoObjectVector scopeChain(cx);
if (!JS_IsGlobalObject(targetObj) && if (!JS_IsGlobalObject(targetObj) &&