[gin] Declare a wrappable's kWrapperInfo on the class deriving from W…

…rappable

Otherwise, we need to put INIT_WRAPPABLE() in namespace gin no matter
where the derived class is declared.

I pulled this out from https://codereview.chromium.org/111083005/

BUG=none
R=dcarney@chromium.org
TBR=aa@chromium.org

Review URL: https://codereview.chromium.org/113163007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240271 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/gin_browsertest.cc

@@ -14,11 +14,15 @@
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
-namespace gin {
+namespace content {
+
+namespace {
 
-class TestGinObject : public Wrappable<TestGinObject> {
+class TestGinObject : public gin::Wrappable<TestGinObject> {
  public:
-  static Handle<TestGinObject> Create(v8::Isolate* isolate, bool* alive) {
+  static gin::WrapperInfo kWrapperInfo;
+
+  static gin::Handle<TestGinObject> Create(v8::Isolate* isolate, bool* alive) {
     return CreateHandle(isolate, new TestGinObject(alive));
   }
 
@@ -31,20 +35,14 @@ class TestGinObject : public Wrappable<TestGinObject> {
   DISALLOW_COPY_AND_ASSIGN(TestGinObject);
 };
 
-INIT_WRAPPABLE(TestGinObject);
-
-}  // namespace gin
-
-namespace content {
-
-namespace {
+gin::WrapperInfo TestGinObject::kWrapperInfo = { gin::kEmbedderNativeGin };
 
 void RegisterTemplates(v8::Isolate* isolate) {
   gin::PerIsolateData* data = gin::PerIsolateData::From(isolate);
 
   v8::Handle<v8::ObjectTemplate> templ = v8::ObjectTemplate::New(isolate);
   templ->SetInternalFieldCount(gin::kNumberOfInternalFields);
-  data->SetObjectTemplate(&gin::TestGinObject::kWrapperInfo, templ);
+  data->SetObjectTemplate(&TestGinObject::kWrapperInfo, templ);
 }
 
 class GinBrowserTest : public RenderViewTest {
@@ -81,7 +79,7 @@ TEST_F(GinBrowserTest, GinAndGarbageCollection) {
 
     // We create the object inside a scope so it's not kept alive by a handle
     // on the stack.
-    gin::TestGinObject::Create(isolate, &alive);
+    TestGinObject::Create(isolate, &alive);
   }
 
   CHECK(alive);

gin/function_template.cc

@@ -8,7 +8,7 @@
 
 namespace gin {
 
-INIT_WRAPPABLE(internal::CallbackHolderBase);
+WrapperInfo internal::CallbackHolderBase::kWrapperInfo = { kEmbedderNativeGin };
 
 void InitFunctionTemplates(PerIsolateData* isolate_data) {
   if (!isolate_data->GetObjectTemplate(

gin/function_template.h

@@ -59,6 +59,9 @@ struct CallbackParamTraits<const T*> {
 // This simple base class is used so that we can share a single object template
 // among every CallbackHolder instance.
 class CallbackHolderBase : public Wrappable<CallbackHolderBase> {
+ public:
+  static WrapperInfo kWrapperInfo;
+
  protected:
   virtual ~CallbackHolderBase() {}
 };

gin/wrappable.h

@@ -63,13 +63,11 @@ class WrappableBase {
 template<typename T>
 class Wrappable : public WrappableBase {
  public:
-  static WrapperInfo kWrapperInfo;
-
   // Retrieve (or create) the v8 wrapper object cooresponding to this object.
   // To customize the wrapper created for a subclass, override GetWrapperInfo()
   // instead of overriding this function.
   v8::Handle<v8::Object> GetWrapper(v8::Isolate* isolate) {
-    return GetWrapperImpl(isolate, &kWrapperInfo);
+    return GetWrapperImpl(isolate, &T::kWrapperInfo);
   }
 
  protected:
@@ -81,14 +79,6 @@ class Wrappable : public WrappableBase {
 };
 
 
-// Subclasses of Wrappable must call this within a cc file to initialize their
-// WrapperInfo. This template must be used inside namespace gin.
-#define INIT_WRAPPABLE(TYPE)                              \
-  template <>                                             \
-  gin::WrapperInfo gin::Wrappable<TYPE>::kWrapperInfo = { \
-      gin::kEmbedderNativeGin                             \
-  }
-
 // This converter handles any subclass of Wrappable.
 template<typename T>
 struct Converter<T*, typename base::enable_if<

gin/wrappable_unittest.cc

@@ -17,6 +17,8 @@ namespace gin {
 
 class MyObject : public Wrappable<MyObject> {
  public:
+  static WrapperInfo kWrapperInfo;
+
   static gin::Handle<MyObject> Create(v8::Isolate* isolate) {
     return CreateHandle(isolate, new MyObject());
   }
@@ -32,14 +34,18 @@ class MyObject : public Wrappable<MyObject> {
 };
 
 class MyObject2 : public Wrappable<MyObject2> {
+ public:
+  static WrapperInfo kWrapperInfo;
 };
 
 class MyObjectBlink : public Wrappable<MyObjectBlink> {
+ public:
+  static WrapperInfo kWrapperInfo;
 };
 
-INIT_WRAPPABLE(gin::MyObject);
-INIT_WRAPPABLE(gin::MyObject2);
-INIT_WRAPPABLE(gin::MyObjectBlink);
+WrapperInfo MyObject::kWrapperInfo = { kEmbedderNativeGin };
+WrapperInfo MyObject2::kWrapperInfo = { kEmbedderNativeGin };
+WrapperInfo MyObjectBlink::kWrapperInfo = { kEmbedderNativeGin };
 
 void RegisterTemplates(v8::Isolate* isolate) {
   PerIsolateData* data = PerIsolateData::From(isolate);

mojo/apps/js/bindings/waiting_callback.cc

@@ -7,8 +7,6 @@
 #include "gin/per_context_data.h"
 #include "gin/per_isolate_data.h"
 
-INIT_WRAPPABLE(mojo::js::WaitingCallback);
-
 namespace mojo {
 namespace js {
 
@@ -20,6 +18,8 @@ v8::Handle<v8::String> GetHiddenPropertyName(v8::Isolate* isolate) {
 
 }  // namespace
 
+gin::WrapperInfo WaitingCallback::kWrapperInfo = { gin::kEmbedderNativeGin };
+
 WaitingCallback::WaitingCallback(v8::Isolate* isolate,
                                  v8::Handle<v8::Function> callback)
       : wait_id_() {

mojo/apps/js/bindings/waiting_callback.h

@@ -16,6 +16,8 @@ namespace js {
 class WaitingCallback : public gin::Wrappable<WaitingCallback>,
                         public BindingsSupport::AsyncWaitCallback {
  public:
+  static gin::WrapperInfo kWrapperInfo;
+
   static gin::Handle<WaitingCallback> Create(
       v8::Isolate* isolate, v8::Handle<v8::Function> callback);