Simplify the way to initialize context

Source/bindings/v8/V8PerContextData.h

 /*
  * Copyright (C) 2012 Google Inc. 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
@@ skipping 41 matching lines @@
 class V8PerContextData;
 struct V8NPObject;
 typedef WTF::Vector<V8NPObject*> V8NPObjectVector;
 typedef WTF::HashMap<int, V8NPObjectVector> V8NPObjectMap;
 
 enum V8ContextEmbedderDataField {
     v8ContextDebugIdIndex = static_cast<int>(gin::kDebugIdIndex),
     v8ContextPerContextDataIndex = static_cast<int>(gin::kPerContextDataStartIndex + gin::kEmbedderBlink),
 };
 
-class V8PerContextDataHolder {
-    WTF_MAKE_NONCOPYABLE(V8PerContextDataHolder);
-public:
-    static void install(v8::Handle<v8::Context> context, DOMWrapperWorld* world)
-    {
-        new V8PerContextDataHolder(context, world);
-    }
-
-    static V8PerContextDataHolder* from(v8::Handle<v8::Context> context)
-    {
-        return static_cast<V8PerContextDataHolder*>(context->GetAlignedPointerFromEmbedderData(v8ContextPerContextDataIndex));
-    }
-
-    V8PerContextData* perContextData() const { return m_perContextData; }
-    void setPerContextData(V8PerContextData* data) { m_perContextData = data; }
-
-    DOMWrapperWorld* world() const { return m_world; }
-
-private:
-    V8PerContextDataHolder(v8::Handle<v8::Context> context, DOMWrapperWorld* world)
-        : m_context(v8::Isolate::GetCurrent(), context)
-        , m_perContextData(0)
-        , m_world(world)
-    {
-        m_context.setWeak(this, &V8PerContextDataHolder::weakCallback);
-        context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this);
-    }
-
-    ~V8PerContextDataHolder() {}
-
-    static void weakCallback(const v8::WeakCallbackData<v8::Context, V8PerContextDataHolder>& data)
-    {
-        data.GetValue()->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, 0);
-        delete data.GetParameter();
-    }
-
-    ScopedPersistent<v8::Context> m_context;
-    V8PerContextData* m_perContextData;
-    // This should not be a RefPtr. Otherwise, it creates a cycle:
-    // V8PerContextData => DOMWrapperWorld => DOMDataStore => global objects
-    // => Window or WorkerGlobalScope => V8PerContextData.
-    DOMWrapperWorld* m_world;
-};
-
 class V8PerContextData {
 public:
-    static PassOwnPtr<V8PerContextData> create(v8::Handle<v8::Context> context)
+    static PassOwnPtr<V8PerContextData> create(v8::Handle<v8::Context> context, DOMWrapperWorld* world)
     {
-        return adoptPtr(new V8PerContextData(context));
+        return adoptPtr(new V8PerContextData(context, world));
     }
 
     ~V8PerContextData();
 
-    bool init();
-
     static V8PerContextData* from(v8::Handle<v8::Context> context)
     {
-        return V8PerContextDataHolder::from(context)->perContextData();
+        return static_cast<V8PerContextData*>(context->GetAlignedPointerFromEmbedderData(v8ContextPerContextDataIndex));
     }
 
+    DOMWrapperWorld* world() const { return m_world; }
+    v8::Handle<v8::Context> context() { return m_context.newLocal(m_isolate); }
+
     // To create JS Wrapper objects, we create a cache of a 'boiler plate'
     // object, and then simply Clone that object each time we need a new one.
     // This is faster than going through the full object creation process.
     v8::Local<v8::Object> createWrapperFromCache(const WrapperTypeInfo* type)
     {
         UnsafePersistent<v8::Object> boilerplate = m_wrapperBoilerplates.get(type);
         return !boilerplate.isEmpty() ? boilerplate.newLocal(v8::Isolate::GetCurrent())->Clone() : createWrapperFromCacheSlowCase(type);
     }
 
     v8::Local<v8::Function> constructorForType(const WrapperTypeInfo* type)
@@ skipping 19 matching lines @@
     void setActivityLogger(V8DOMActivityLogger* logger)
     {
         m_activityLogger = logger;
     }
 
     void addCustomElementBinding(CustomElementDefinition*, PassOwnPtr<CustomElementBinding>);
     void clearCustomElementBinding(CustomElementDefinition*);
     CustomElementBinding* customElementBinding(CustomElementDefinition*);
 
 private:
-    explicit V8PerContextData(v8::Handle<v8::Context> context)
-        : m_activityLogger(0)
-        , m_isolate(v8::Isolate::GetCurrent())
-        , m_context(m_isolate, context)
-        , m_customElementBindings(adoptPtr(new CustomElementBindingMap()))
-    {
-    }
+    V8PerContextData(v8::Handle<v8::Context>, DOMWrapperWorld*);
 
     v8::Local<v8::Object> createWrapperFromCacheSlowCase(const WrapperTypeInfo*);
     v8::Local<v8::Function> constructorForTypeSlowCase(const WrapperTypeInfo*);
 
     // For each possible type of wrapper, we keep a boilerplate object.
     // The boilerplate is used to create additional wrappers of the same type.
     typedef WTF::HashMap<const WrapperTypeInfo*, UnsafePersistent<v8::Object> > WrapperBoilerplateMap;
     WrapperBoilerplateMap m_wrapperBoilerplates;
 
     typedef WTF::HashMap<const WrapperTypeInfo*, UnsafePersistent<v8::Function> > ConstructorMap;
     ConstructorMap m_constructorMap;
 
     V8NPObjectMap m_v8NPObjectMap;
     // We cache a pointer to the V8DOMActivityLogger associated with the world
     // corresponding to this context. The ownership of the pointer is retained
     // by the DOMActivityLoggerMap in DOMWrapperWorld.
     V8DOMActivityLogger* m_activityLogger;
+
     v8::Isolate* m_isolate;
+    OwnPtr<gin::ContextHolder> m_contextHolder;
+
+    // This should not be a RefPtr. Otherwise, it creates a cycle:
+    // V8PerContextData => DOMWrapperWorld => DOMDataStore => global objects
+    // => Window or WorkerGlobalScope => V8PerContextData.
+    DOMWrapperWorld* m_world;
+
     ScopedPersistent<v8::Context> m_context;
     ScopedPersistent<v8::Value> m_errorPrototype;
 
     typedef WTF::HashMap<CustomElementDefinition*, OwnPtr<CustomElementBinding> > CustomElementBindingMap;
     OwnPtr<CustomElementBindingMap> m_customElementBindings;
 };
 
 class V8PerContextDebugData {
 public:
     static bool setContextDebugData(v8::Handle<v8::Context>, const char* worldName, int debugId);
     static int contextDebugId(v8::Handle<v8::Context>);
 };
 
 } // namespace WebCore
 
 #endif // V8PerContextData_h