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

Side by Side Diff: src/api.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 | « no previous file | src/arm/builtins-arm.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 4421 matching lines...) Expand 10 before | Expand all | Expand 10 after
4432 4432
4433 4433
4434 void v8::Context::UseDefaultSecurityToken() { 4434 void v8::Context::UseDefaultSecurityToken() {
4435 i::Isolate* isolate = i::Isolate::Current(); 4435 i::Isolate* isolate = i::Isolate::Current();
4436 if (IsDeadCheck(isolate, 4436 if (IsDeadCheck(isolate,
4437 "v8::Context::UseDefaultSecurityToken()")) { 4437 "v8::Context::UseDefaultSecurityToken()")) {
4438 return; 4438 return;
4439 } 4439 }
4440 ENTER_V8(isolate); 4440 ENTER_V8(isolate);
4441 i::Handle<i::Context> env = Utils::OpenHandle(this); 4441 i::Handle<i::Context> env = Utils::OpenHandle(this);
4442 env->set_security_token(env->global()); 4442 env->set_security_token(env->global_object());
4443 } 4443 }
4444 4444
4445 4445
4446 Handle<Value> v8::Context::GetSecurityToken() { 4446 Handle<Value> v8::Context::GetSecurityToken() {
4447 i::Isolate* isolate = i::Isolate::Current(); 4447 i::Isolate* isolate = i::Isolate::Current();
4448 if (IsDeadCheck(isolate, "v8::Context::GetSecurityToken()")) { 4448 if (IsDeadCheck(isolate, "v8::Context::GetSecurityToken()")) {
4449 return Handle<Value>(); 4449 return Handle<Value>();
4450 } 4450 }
4451 i::Handle<i::Context> env = Utils::OpenHandle(this); 4451 i::Handle<i::Context> env = Utils::OpenHandle(this);
4452 i::Object* security_token = env->security_token(); 4452 i::Object* security_token = env->security_token();
(...skipping 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after
5791 5791
5792 5792
5793 Local<Value> Debug::GetMirror(v8::Handle<v8::Value> obj) { 5793 Local<Value> Debug::GetMirror(v8::Handle<v8::Value> obj) {
5794 i::Isolate* isolate = i::Isolate::Current(); 5794 i::Isolate* isolate = i::Isolate::Current();
5795 if (!isolate->IsInitialized()) return Local<Value>(); 5795 if (!isolate->IsInitialized()) return Local<Value>();
5796 ON_BAILOUT(isolate, "v8::Debug::GetMirror()", return Local<Value>()); 5796 ON_BAILOUT(isolate, "v8::Debug::GetMirror()", return Local<Value>());
5797 ENTER_V8(isolate); 5797 ENTER_V8(isolate);
5798 v8::HandleScope scope; 5798 v8::HandleScope scope;
5799 i::Debug* isolate_debug = isolate->debug(); 5799 i::Debug* isolate_debug = isolate->debug();
5800 isolate_debug->Load(); 5800 isolate_debug->Load();
5801 i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global()); 5801 i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global_object());
5802 i::Handle<i::String> name = 5802 i::Handle<i::String> name =
5803 isolate->factory()->LookupAsciiSymbol("MakeMirror"); 5803 isolate->factory()->LookupAsciiSymbol("MakeMirror");
5804 i::Handle<i::Object> fun_obj = i::GetProperty(debug, name); 5804 i::Handle<i::Object> fun_obj = i::GetProperty(debug, name);
5805 i::Handle<i::JSFunction> fun = i::Handle<i::JSFunction>::cast(fun_obj); 5805 i::Handle<i::JSFunction> fun = i::Handle<i::JSFunction>::cast(fun_obj);
5806 v8::Handle<v8::Function> v8_fun = Utils::ToLocal(fun); 5806 v8::Handle<v8::Function> v8_fun = Utils::ToLocal(fun);
5807 const int kArgc = 1; 5807 const int kArgc = 1;
5808 v8::Handle<v8::Value> argv[kArgc] = { obj }; 5808 v8::Handle<v8::Value> argv[kArgc] = { obj };
5809 EXCEPTION_PREAMBLE(isolate); 5809 EXCEPTION_PREAMBLE(isolate);
5810 v8::Handle<v8::Value> result = v8_fun->Call(Utils::ToLocal(debug), 5810 v8::Handle<v8::Value> result = v8_fun->Call(Utils::ToLocal(debug),
5811 kArgc, 5811 kArgc,
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
6526 6526
6527 v->VisitPointers(blocks_.first(), first_block_limit_); 6527 v->VisitPointers(blocks_.first(), first_block_limit_);
6528 6528
6529 for (int i = 1; i < blocks_.length(); i++) { 6529 for (int i = 1; i < blocks_.length(); i++) {
6530 v->VisitPointers(blocks_[i], &blocks_[i][kHandleBlockSize]); 6530 v->VisitPointers(blocks_[i], &blocks_[i][kHandleBlockSize]);
6531 } 6531 }
6532 } 6532 }
6533 6533
6534 6534
6535 } } // namespace v8::internal 6535 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/arm/builtins-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698