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

Unified Diff: src/contexts-inl.h

Issue 1406113007: Merge GlobalObject with JSGlobalObject. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/contexts.cc ('k') | src/crankshaft/arm/lithium-codegen-arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/contexts-inl.h
diff --git a/src/contexts-inl.h b/src/contexts-inl.h
index e88cd33ad3b80b653a37bdd1db6e3ef5fe3aef2a..437aacf4afb451a0d81931bc82de251e0951275e 100644
--- a/src/contexts-inl.h
+++ b/src/contexts-inl.h
@@ -65,14 +65,14 @@ JSModule* Context::module() { return JSModule::cast(get(EXTENSION_INDEX)); }
void Context::set_module(JSModule* module) { set(EXTENSION_INDEX, module); }
-GlobalObject* Context::global_object() {
+JSGlobalObject* Context::global_object() {
Object* result = get(GLOBAL_OBJECT_INDEX);
DCHECK(IsBootstrappingOrGlobalObject(this->GetIsolate(), result));
- return reinterpret_cast<GlobalObject*>(result);
+ return reinterpret_cast<JSGlobalObject*>(result);
}
-void Context::set_global_object(GlobalObject* object) {
+void Context::set_global_object(JSGlobalObject* object) {
set(GLOBAL_OBJECT_INDEX, object);
}
« no previous file with comments | « src/contexts.cc ('k') | src/crankshaft/arm/lithium-codegen-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698