Remove execScript from V8. No longer present i neither Firefox nor Safari.
R=ricow@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/7046002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7948 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
c5c57d722a
commit
98778dc802
@ -148,17 +148,6 @@ function GlobalEval(x) {
|
||||
}
|
||||
|
||||
|
||||
// execScript for IE compatibility.
|
||||
function GlobalExecScript(expr, lang) {
|
||||
// NOTE: We don't care about the character casing.
|
||||
if (!lang || /javascript/i.test(lang)) {
|
||||
var f = %CompileString(ToString(expr));
|
||||
%_CallFunction(%GlobalReceiver(global), f);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -178,8 +167,7 @@ function SetupGlobal() {
|
||||
"isFinite", GlobalIsFinite,
|
||||
"parseInt", GlobalParseInt,
|
||||
"parseFloat", GlobalParseFloat,
|
||||
"eval", GlobalEval,
|
||||
"execScript", GlobalExecScript
|
||||
"eval", GlobalEval
|
||||
));
|
||||
}
|
||||
|
||||
|
@ -14431,8 +14431,6 @@ void CheckCodeGenerationAllowed() {
|
||||
CHECK_EQ(42, result->Int32Value());
|
||||
result = CompileRun("(function(e) { return e('42'); })(eval)");
|
||||
CHECK_EQ(42, result->Int32Value());
|
||||
result = CompileRun("execScript('42')");
|
||||
CHECK(!result.IsEmpty());
|
||||
result = CompileRun("var f = new Function('return 42'); f()");
|
||||
CHECK_EQ(42, result->Int32Value());
|
||||
}
|
||||
@ -14451,11 +14449,6 @@ void CheckCodeGenerationDisallowed() {
|
||||
CHECK(try_catch.HasCaught());
|
||||
try_catch.Reset();
|
||||
|
||||
result = CompileRun("execScript('42')");
|
||||
CHECK(result.IsEmpty());
|
||||
CHECK(try_catch.HasCaught());
|
||||
try_catch.Reset();
|
||||
|
||||
result = CompileRun("var f = new Function('return 42'); f()");
|
||||
CHECK(result.IsEmpty());
|
||||
CHECK(try_catch.HasCaught());
|
||||
@ -14478,10 +14471,10 @@ THREADED_TEST(AllowCodeGenFromStrings) {
|
||||
v8::HandleScope scope;
|
||||
LocalContext context;
|
||||
|
||||
// eval, execScript and the Function constructor allowed by default.
|
||||
// eval and the Function constructor allowed by default.
|
||||
CheckCodeGenerationAllowed();
|
||||
|
||||
// Disallow eval, execScript and the Function constructor.
|
||||
// Disallow eval and the Function constructor.
|
||||
context->AllowCodeGenerationFromStrings(false);
|
||||
CheckCodeGenerationDisallowed();
|
||||
|
||||
|
@ -1,34 +0,0 @@
|
||||
// Copyright 2008 the V8 project authors. All rights reserved.
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following
|
||||
// disclaimer in the documentation and/or other materials provided
|
||||
// with the distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived
|
||||
// from this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
var x = 0;
|
||||
execScript('x = 1', 'javascript');
|
||||
assertEquals(1, x);
|
||||
|
||||
execScript('x = 2', 'JavaScript');
|
||||
assertEquals(2, x);
|
||||
|
@ -128,6 +128,6 @@ var globalFunctions = [
|
||||
"encodeURI", "encodeURIComponent", "Error", "TypeError",
|
||||
"RangeError", "SyntaxError", "ReferenceError", "EvalError",
|
||||
"URIError", "isNaN", "isFinite", "parseInt", "parseFloat",
|
||||
"eval", "execScript"];
|
||||
"eval"];
|
||||
|
||||
TestFunctionNames(this, globalFunctions);
|
||||
|
@ -1,33 +0,0 @@
|
||||
// Copyright 2008 the V8 project authors. All rights reserved.
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following
|
||||
// disclaimer in the documentation and/or other materials provided
|
||||
// with the distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived
|
||||
// from this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// Make sure that 'this' is bound to the global object when using
|
||||
// execScript.
|
||||
|
||||
var result;
|
||||
execScript("result = this");
|
||||
assertTrue(result === this);
|
Loading…
Reference in New Issue
Block a user