Make inspector objects ScriptWrappable

BUG=236671
R=abarth@chromium.org

Review URL: https://chromiumcodereview.appspot.com/14918010

git-svn-id: svn://svn.chromium.org/blink/trunk@150692 bbb929c8-8fbe-4397-9dbb-9b2b20218538

8 files changed, 19 insertions, 7 deletions

diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
index b530f6a..bee89e0 100644
--- a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
+++ b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
@@ -71,6 +71,7 @@ InjectedScriptHost::InjectedScriptHost()
     , m_domStorageAgent(0)
     , m_domAgent(0)
 {
+    ScriptWrappable::init(this);
     m_defaultInspectableObject = adoptPtr(new InspectableObject());
 }
 
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h
index 7c63ae3..1f1004f 100644
--- a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h
+++ b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h
@@ -31,6 +31,7 @@
 #define InjectedScriptHost_h
 
 #include "bindings/v8/ScriptState.h"
+#include "bindings/v8/ScriptWrappable.h"
 #include "core/inspector/InspectorAgent.h"
 #include "core/page/ConsoleTypes.h"
 #include <wtf/RefCounted.h>
@@ -57,7 +58,7 @@ class Storage;
 
 struct EventListenerInfo;
 
-class InjectedScriptHost : public RefCounted<InjectedScriptHost> {
+class InjectedScriptHost : public RefCounted<InjectedScriptHost>, public ScriptWrappable {
 public:
     static PassRefPtr<InjectedScriptHost> create();
     ~InjectedScriptHost();
diff --git a/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.cpp b/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.cpp
index 9881f83..988e9c01 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.cpp
@@ -123,6 +123,7 @@ InspectorFrontendHost::InspectorFrontendHost(InspectorFrontendClient* client, Pa
     , m_frontendPage(frontendPage)
     , m_menuProvider(0)
 {
+    ScriptWrappable::init(this);
 }
 
 InspectorFrontendHost::~InspectorFrontendHost()
diff --git a/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.h b/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.h
index f7682e8..fb9da0c 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorFrontendHost.h
@@ -29,6 +29,7 @@
 #ifndef InspectorFrontendHost_h
 #define InspectorFrontendHost_h
 
+#include "bindings/v8/ScriptWrappable.h"
 #include "core/page/ConsoleTypes.h"
 #include "core/page/ContextMenuProvider.h"
 #include "core/platform/ContextMenu.h"
@@ -47,7 +48,7 @@ class InspectorFrontendClient;
 class Node;
 class Page;
 
-class InspectorFrontendHost : public RefCounted<InspectorFrontendHost> {
+class InspectorFrontendHost : public RefCounted<InspectorFrontendHost>, public ScriptWrappable {
 public:
     static PassRefPtr<InspectorFrontendHost> create(InspectorFrontendClient* client, Page* frontendPage)
     {
diff --git a/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.cpp b/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.cpp
index 2548acd..c6ae8be 100644
--- a/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.cpp
+++ b/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.cpp
@@ -39,6 +39,7 @@ JavaScriptCallFrame::JavaScriptCallFrame(v8::Handle<v8::Context> debuggerContext
     : m_debuggerContext(debuggerContext)
     , m_callFrame(callFrame)
 {
+    ScriptWrappable::init(this);
 }
 
 JavaScriptCallFrame::~JavaScriptCallFrame()
diff --git a/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.h b/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.h
index 391af77..9fbaf44 100644
--- a/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.h
+++ b/third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.h
@@ -33,13 +33,14 @@
 
 
 #include "bindings/v8/ScopedPersistent.h"
+#include "bindings/v8/ScriptWrappable.h"
 #include <v8-debug.h>
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
-class JavaScriptCallFrame : public RefCounted<JavaScriptCallFrame> {
+class JavaScriptCallFrame : public RefCounted<JavaScriptCallFrame>, public ScriptWrappable {
 public:
     static PassRefPtr<JavaScriptCallFrame> create(v8::Handle<v8::Context> debuggerContext, v8::Handle<v8::Object> callFrame)
     {
diff --git a/third_party/WebKit/Source/core/inspector/ScriptProfile.h b/third_party/WebKit/Source/core/inspector/ScriptProfile.h
index de86412..e2ee6b6 100644
--- a/third_party/WebKit/Source/core/inspector/ScriptProfile.h
+++ b/third_party/WebKit/Source/core/inspector/ScriptProfile.h
@@ -32,6 +32,7 @@
 #define ScriptProfile_h
 
 #include "InspectorTypeBuilder.h"
+#include "bindings/v8/ScriptWrappable.h"
 #include "core/inspector/ScriptProfileNode.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
@@ -44,7 +45,7 @@ namespace WebCore {
 
 class InspectorObject;
 
-class ScriptProfile : public RefCounted<ScriptProfile> {
+class ScriptProfile : public RefCounted<ScriptProfile>, public ScriptWrappable {
 public:
     static PassRefPtr<ScriptProfile> create(const v8::CpuProfile* profile, double idleTime)
     {
@@ -64,7 +65,9 @@ private:
     ScriptProfile(const v8::CpuProfile* profile, double idleTime)
         : m_profile(profile)
         , m_idleTime(idleTime)
-    {}
+    {
+        ScriptWrappable::init(this);
+    }
 
     const v8::CpuProfile* m_profile;
     double m_idleTime;
diff --git a/third_party/WebKit/Source/core/inspector/ScriptProfileNode.h b/third_party/WebKit/Source/core/inspector/ScriptProfileNode.h
index d2fb117..041c4e4 100644
--- a/third_party/WebKit/Source/core/inspector/ScriptProfileNode.h
+++ b/third_party/WebKit/Source/core/inspector/ScriptProfileNode.h
@@ -31,6 +31,7 @@
 #ifndef ScriptProfileNode_h
 #define ScriptProfileNode_h
 
+#include "bindings/v8/ScriptWrappable.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
@@ -44,7 +45,7 @@ class ScriptProfileNode;
 
 typedef Vector<RefPtr<ScriptProfileNode> > ProfileNodesList;
 
-class ScriptProfileNode : public RefCounted<ScriptProfileNode> {
+class ScriptProfileNode : public RefCounted<ScriptProfileNode>, public ScriptWrappable {
 public:
     static PassRefPtr<ScriptProfileNode> create(const v8::CpuProfileNode* profileNode)
     {
@@ -65,7 +66,9 @@ public:
 protected:
     ScriptProfileNode(const v8::CpuProfileNode* profileNode)
         : m_profileNode(profileNode)
-    {}
+    {
+        ScriptWrappable::init(this);
+    }
 
 private:
     const v8::CpuProfileNode* m_profileNode;