Revision: 4775
Author: lukezarko
Date: Wed Jun 2 00:42:37 2010
Log: - Begin removing [static] qualifier from methods in Bootstrapper.
Review URL: http://codereview.chromium.org/2461002
http://code.google.com/p/v8/source/detail?r=4775
Modified:
/branches/experimental/isolates/src/api.cc
/branches/experimental/isolates/src/bootstrapper.h
/branches/experimental/isolates/src/debug.cc
/branches/experimental/isolates/src/heap.cc
/branches/experimental/isolates/src/isolate.cc
/branches/experimental/isolates/src/v8.cc
/branches/experimental/isolates/src/v8threads.cc
=======================================
--- /branches/experimental/isolates/src/api.cc Tue Jun 1 03:51:42 2010
+++ /branches/experimental/isolates/src/api.cc Wed Jun 2 00:42:37 2010
@@ -3158,7 +3158,7 @@
}
// Create the environment.
- env = i::Bootstrapper::CreateEnvironment(
+ env = i::Isolate::Current()->bootstrapper()->CreateEnvironment(
Utils::OpenHandle(*global_object),
proxy_template,
extensions);
@@ -3261,7 +3261,7 @@
i::Object** ctx = reinterpret_cast<i::Object**>(this);
i::Handle<i::Context> context =
i::Handle<i::Context>::cast(i::Handle<i::Object>(ctx));
- i::Bootstrapper::DetachGlobal(context);
+ i::Isolate::Current()->bootstrapper()->DetachGlobal(context);
}
@@ -3271,7 +3271,9 @@
i::Object** ctx = reinterpret_cast<i::Object**>(this);
i::Handle<i::Context> context =
i::Handle<i::Context>::cast(i::Handle<i::Object>(ctx));
- i::Bootstrapper::ReattachGlobal(context,
Utils::OpenHandle(*global_object));
+ i::Isolate::Current()->bootstrapper()->ReattachGlobal(
+ context,
+ Utils::OpenHandle(*global_object));
}
=======================================
--- /branches/experimental/isolates/src/bootstrapper.h Tue Jun 1 08:39:14
2010
+++ /branches/experimental/isolates/src/bootstrapper.h Wed Jun 2 00:42:37
2010
@@ -55,24 +55,24 @@
class Bootstrapper {
public:
// Requires: Heap::Setup has been called.
- static void Initialize(bool create_heap_objects);
- static void TearDown();
+ void Initialize(bool create_heap_objects);
+ void TearDown();
// Creates a JavaScript Global Context with initial object graph.
// The returned value is a global handle casted to V8Environment*.
- static Handle<Context> CreateEnvironment(
+ Handle<Context> CreateEnvironment(
Handle<Object> global_object,
v8::Handle<v8::ObjectTemplate> global_template,
v8::ExtensionConfiguration* extensions);
// Detach the environment from its outer global object.
- static void DetachGlobal(Handle<Context> env);
+ void DetachGlobal(Handle<Context> env);
// Reattach an outer global object to an environment.
- static void ReattachGlobal(Handle<Context> env, Handle<Object>
global_object);
+ void ReattachGlobal(Handle<Context> env, Handle<Object> global_object);
// Traverses the pointers for memory management.
- static void Iterate(ObjectVisitor* v);
+ void Iterate(ObjectVisitor* v);
// Accessor for the native scripts source code.
static Handle<String> NativesSourceLookup(int index);
@@ -81,18 +81,18 @@
static bool IsActive() { return BootstrapperActive::IsActive(); }
// Support for thread preemption.
- static int ArchiveSpacePerThread();
- static char* ArchiveState(char* to);
- static char* RestoreState(char* from);
- static void FreeThreadResources();
+ int ArchiveSpacePerThread();
+ char* ArchiveState(char* to);
+ char* RestoreState(char* from);
+ void FreeThreadResources();
// This will allocate a char array that is deleted when V8 is shut down.
// It should only be used for strictly finite allocations.
static char* AllocateAutoDeletedArray(int bytes);
// Used for new context creation.
- static bool InstallExtensions(Handle<Context> global_context,
- v8::ExtensionConfiguration* extensions);
+ bool InstallExtensions(Handle<Context> global_context,
+ v8::ExtensionConfiguration* extensions);
private:
friend class Isolate;
=======================================
--- /branches/experimental/isolates/src/debug.cc Tue Jun 1 03:51:42 2010
+++ /branches/experimental/isolates/src/debug.cc Wed Jun 2 00:42:37 2010
@@ -758,9 +758,10 @@
// Create the debugger context.
HandleScope scope;
Handle<Context> context =
- Bootstrapper::CreateEnvironment(Handle<Object>::null(),
- v8::Handle<ObjectTemplate>(),
- NULL);
+ Isolate::Current()->bootstrapper()->CreateEnvironment(
+ Handle<Object>::null(),
+ v8::Handle<ObjectTemplate>(),
+ NULL);
// Use the debugger context.
SaveContext save;
=======================================
--- /branches/experimental/isolates/src/heap.cc Tue Jun 1 03:51:42 2010
+++ /branches/experimental/isolates/src/heap.cc Wed Jun 2 00:42:37 2010
@@ -3702,7 +3702,7 @@
v->VisitPointer(BitCast<Object**, String**>(&hidden_symbol_));
v->Synchronize("symbol");
- Bootstrapper::Iterate(v);
+ Isolate::Current()->bootstrapper()->Iterate(v);
v->Synchronize("bootstrapper");
Top::Iterate(v);
v->Synchronize("top");
=======================================
--- /branches/experimental/isolates/src/isolate.cc Tue Jun 1 09:15:26 2010
+++ /branches/experimental/isolates/src/isolate.cc Wed Jun 2 00:42:37 2010
@@ -120,7 +120,7 @@
return false;
}
- Bootstrapper::Initialize(create_heap_objects);
+ bootstrapper_->Initialize(create_heap_objects);
Builtins::Setup(create_heap_objects);
Top::Initialize();
=======================================
--- /branches/experimental/isolates/src/v8.cc Mon May 31 21:48:19 2010
+++ /branches/experimental/isolates/src/v8.cc Wed Jun 2 00:42:37 2010
@@ -75,7 +75,7 @@
}
Builtins::TearDown();
- Bootstrapper::TearDown();
+ Isolate::Current()->bootstrapper()->TearDown();
Top::TearDown();
=======================================
--- /branches/experimental/isolates/src/v8threads.cc Sat Mar 20 15:37:15
2010
+++ /branches/experimental/isolates/src/v8threads.cc Wed Jun 2 00:42:37
2010
@@ -164,7 +164,7 @@
#endif
from = StackGuard::RestoreStackGuard(from);
from = RegExpStack::RestoreStack(from);
- from = Bootstrapper::RestoreState(from);
+ from = Isolate::Current()->bootstrapper()->RestoreState(from);
Thread::SetThreadLocal(thread_state_key, NULL);
if (state->terminate_on_restore()) {
StackGuard::TerminateExecution();
@@ -198,7 +198,8 @@
#endif
StackGuard::ArchiveSpacePerThread() +
RegExpStack::ArchiveSpacePerThread() +
- Bootstrapper::ArchiveSpacePerThread() +
+ Isolate::Current()->bootstrapper()->
+ ArchiveSpacePerThread() +
Relocatable::ArchiveSpacePerThread();
}
@@ -295,7 +296,7 @@
#endif
to = StackGuard::ArchiveStackGuard(to);
to = RegExpStack::ArchiveStack(to);
- to = Bootstrapper::ArchiveState(to);
+ to = Isolate::Current()->bootstrapper()->ArchiveState(to);
lazily_archived_thread_.Initialize(ThreadHandle::INVALID);
lazily_archived_thread_state_ = NULL;
}
@@ -309,7 +310,7 @@
#endif
StackGuard::FreeThreadResources();
RegExpStack::FreeThreadResources();
- Bootstrapper::FreeThreadResources();
+ Isolate::Current()->bootstrapper()->FreeThreadResources();
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
