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

Side by Side Diff: src/d8.cc

Issue 10832365: Rename Context::global to Context::global_object, (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Addressed Michael's comments. Created 8 years, 4 months 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/contexts.cc ('k') | src/debug.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 utility_context_->SetSecurityToken(Undefined()); 1046 utility_context_->SetSecurityToken(Undefined());
1047 evaluation_context_->SetSecurityToken(Undefined()); 1047 evaluation_context_->SetSecurityToken(Undefined());
1048 Context::Scope utility_scope(utility_context_); 1048 Context::Scope utility_scope(utility_context_);
1049 1049
1050 #ifdef ENABLE_DEBUGGER_SUPPORT 1050 #ifdef ENABLE_DEBUGGER_SUPPORT
1051 if (i::FLAG_debugger) printf("JavaScript debugger enabled\n"); 1051 if (i::FLAG_debugger) printf("JavaScript debugger enabled\n");
1052 // Install the debugger object in the utility scope 1052 // Install the debugger object in the utility scope
1053 i::Debug* debug = i::Isolate::Current()->debug(); 1053 i::Debug* debug = i::Isolate::Current()->debug();
1054 debug->Load(); 1054 debug->Load();
1055 i::Handle<i::JSObject> js_debug 1055 i::Handle<i::JSObject> js_debug
1056 = i::Handle<i::JSObject>(debug->debug_context()->global()); 1056 = i::Handle<i::JSObject>(debug->debug_context()->global_object());
1057 utility_context_->Global()->Set(String::New("$debug"), 1057 utility_context_->Global()->Set(String::New("$debug"),
1058 Utils::ToLocal(js_debug)); 1058 Utils::ToLocal(js_debug));
1059 debug->debug_context()->set_security_token(HEAP->undefined_value()); 1059 debug->debug_context()->set_security_token(HEAP->undefined_value());
1060 #endif // ENABLE_DEBUGGER_SUPPORT 1060 #endif // ENABLE_DEBUGGER_SUPPORT
1061 1061
1062 // Run the d8 shell utility script in the utility context 1062 // Run the d8 shell utility script in the utility context
1063 int source_index = i::NativesCollection<i::D8>::GetIndex("d8"); 1063 int source_index = i::NativesCollection<i::D8>::GetIndex("d8");
1064 i::Vector<const char> shell_source = 1064 i::Vector<const char> shell_source =
1065 i::NativesCollection<i::D8>::GetRawScriptSource(source_index); 1065 i::NativesCollection<i::D8>::GetRawScriptSource(source_index);
1066 i::Vector<const char> shell_source_name = 1066 i::Vector<const char> shell_source_name =
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 } 1893 }
1894 1894
1895 } // namespace v8 1895 } // namespace v8
1896 1896
1897 1897
1898 #ifndef GOOGLE3 1898 #ifndef GOOGLE3
1899 int main(int argc, char* argv[]) { 1899 int main(int argc, char* argv[]) {
1900 return v8::Shell::Main(argc, argv); 1900 return v8::Shell::Main(argc, argv);
1901 } 1901 }
1902 #endif 1902 #endif
OLDNEW
« no previous file with comments | « src/contexts.cc ('k') | src/debug.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698