Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: src/v8natives.js

Issue 11227: Fixing wrong reference to this in eval. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/runtime.cc ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (!IS_STRING(x)) return x; 106 if (!IS_STRING(x)) return x;
107 107
108 if (this !== %GlobalReceiver(global)) { 108 if (this !== %GlobalReceiver(global)) {
109 throw new $EvalError('The "this" object passed to eval must ' + 109 throw new $EvalError('The "this" object passed to eval must ' +
110 'be the global object from which eval originated'); 110 'be the global object from which eval originated');
111 } 111 }
112 112
113 var f = %CompileString(x, 0, true); 113 var f = %CompileString(x, 0, true);
114 if (!IS_FUNCTION(f)) return f; 114 if (!IS_FUNCTION(f)) return f;
115 115
116 return f.call(this); 116 return f.call(%EvalReceiver(this));
117 } 117 }
118 118
119 119
120 // execScript for IE compatibility. 120 // execScript for IE compatibility.
121 function GlobalExecScript(expr, lang) { 121 function GlobalExecScript(expr, lang) {
122 // NOTE: We don't care about the character casing. 122 // NOTE: We don't care about the character casing.
123 if (!lang || /javascript/i.test(lang)) { 123 if (!lang || /javascript/i.test(lang)) {
124 var f = %CompileString(ToString(expr), 0, false); 124 var f = %CompileString(ToString(expr), 0, false);
125 f.call(%GlobalReceiver(global)); 125 f.call(%GlobalReceiver(global));
126 } 126 }
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 // ---------------------------------------------------------------------------- 531 // ----------------------------------------------------------------------------
532 532
533 function SetupFunction() { 533 function SetupFunction() {
534 InstallFunctions($Function.prototype, DONT_ENUM, $Array( 534 InstallFunctions($Function.prototype, DONT_ENUM, $Array(
535 "toString", FunctionToString 535 "toString", FunctionToString
536 )); 536 ));
537 } 537 }
538 538
539 SetupFunction(); 539 SetupFunction();
540 540
OLDNEW
« no previous file with comments | « src/runtime.cc ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698