[Isolates] Make statics from BootstrapperActive to be instance members

src/bootstrapper.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #ifndef V8_BOOTSTRAPPER_H_
 #define V8_BOOTSTRAPPER_H_
 
 namespace v8 {
 namespace internal {
 
 
-class BootstrapperActive BASE_EMBEDDED {
- public:
-  BootstrapperActive() { nesting_++; }
-  ~BootstrapperActive() { nesting_--; }
-
-  // Support for thread preemption.
-  static int ArchiveSpacePerThread();
-  static char* ArchiveState(char* to);
-  static char* RestoreState(char* from);
-
- private:
-  static bool IsActive() { return nesting_ != 0; }
-  static int nesting_;
-  friend class Bootstrapper;
-};
-
-
 // The Boostrapper is the public interface for creating a JavaScript global
 // context.
 class Bootstrapper {
  public:
   // Requires: Heap::Setup has been called.
   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*.
   Handle<Context> CreateEnvironment(
       Handle<Object> global_object,
       v8::Handle<v8::ObjectTemplate> global_template,
       v8::ExtensionConfiguration* extensions);
 
   // Detach the environment from its outer global object.
   void DetachGlobal(Handle<Context> env);
 
   // Reattach an outer global object to an environment.
   void ReattachGlobal(Handle<Context> env, Handle<Object> global_object);
 
   // Traverses the pointers for memory management.
   void Iterate(ObjectVisitor* v);
 
   // Accessor for the native scripts source code.
   static Handle<String> NativesSourceLookup(int index);
 
   // Tells whether bootstrapping is active.
-  static bool IsActive() { return BootstrapperActive::IsActive(); }
+  bool IsActive() const { return nesting_ != 0; }
 
   // Support for thread preemption.
   RLYSTC 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.
   bool InstallExtensions(Handle<Context> global_context,
                          v8::ExtensionConfiguration* extensions);
 
  private:
+  typedef int NestingCounterType;
+  NestingCounterType nesting_;
+
+  friend class BootstrapperActive;
   friend class Isolate;
+
   Bootstrapper();
 
   DISALLOW_COPY_AND_ASSIGN(Bootstrapper);
 };
 
 
+class BootstrapperActive BASE_EMBEDDED {
+ public:
+  BootstrapperActive() {
+    ++Isolate::Current()->bootstrapper()->nesting_;
+  }
+
+  ~BootstrapperActive() {
+    --Isolate::Current()->bootstrapper()->nesting_;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BootstrapperActive);
+};
+
+
 class NativesExternalStringResource
     : public v8::String::ExternalAsciiStringResource {
  public:
   explicit NativesExternalStringResource(const char* source);
 
   const char* data() const {
     return data_;
   }
 
   size_t length() const {
     return length_;
   }
  private:
   const char* data_;
   size_t length_;
 };
 
 }}  // namespace v8::internal
 
 #endif  // V8_BOOTSTRAPPER_H_