Unfork Inspector, Chromium side.

R=darin

Review URL: http://codereview.chromium.org/67052

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

4 files changed, 18 insertions, 1 deletions

diff --git a/webkit/port/bindings/v8/JSDOMBinding.h b/webkit/port/bindings/v8/JSDOMBinding.h
index 8ed5602..350dc94 100644
--- a/webkit/port/bindings/v8/JSDOMBinding.h
+++ b/webkit/port/bindings/v8/JSDOMBinding.h
@@ -34,10 +34,11 @@
 #ifndef JSDOMBinding_h
 #define JSDOMBinding_h
 
+#include "ScriptState.h"
+
 namespace WebCore {
     class Node;
     class Document;
-    class ScriptState;
 
     void updateDOMNodeDocument(Node*, Document* oldDocument,
                                Document* newDocument);
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp
index 0f5c2ed..4bb0b69 100644
--- a/webkit/port/bindings/v8/ScriptController.cpp
+++ b/webkit/port/bindings/v8/ScriptController.cpp
@@ -43,6 +43,7 @@
 #include "npruntime_priv.h"
 #include "NPV8Object.h"
 #include "ScriptSourceCode.h"
+#include "ScriptState.h"
 #include "Widget.h"
 
 #include "v8_proxy.h"
@@ -104,6 +105,7 @@ ScriptController::ScriptController(Frame* frame)
     , m_sourceURL(0)
     , m_processingTimerCallback(false)
     , m_paused(false)
+    , m_scriptState(new ScriptState(frame))
     , m_proxy(new V8Proxy(frame))
 #if ENABLE(NETSCAPE_PLUGIN_API)
     , m_windowScriptNPObject(0)
diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index 84bd3bf..b72b7c6 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -129,6 +129,7 @@ class Frame;
 class HTMLPlugInElement;
 class Node;
 class ScriptSourceCode;
+class ScriptState;
 class String;
 class Widget;
 
@@ -167,6 +168,8 @@ public:
     // with what JSC does as well.
     ScriptController* windowShell() { return this; }
 
+    ScriptState* state() const { return m_scriptState.get(); }
+
     void disposeJSResult(JSResult result);
     void collectGarbage();
 
@@ -246,6 +249,7 @@ private:
     bool m_processingTimerCallback;
     bool m_paused;
 
+    OwnPtr<ScriptState> m_scriptState;
     OwnPtr<V8Proxy> m_proxy;
     typedef HashMap<void*, NPObject*> PluginObjectMap;
 
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index e8a0bad..49f7c75 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -432,6 +432,16 @@ DECLARE_CALLBACK(TreeWalkerNextSibling)
 DECLARE_CALLBACK(TreeWalkerPreviousSibling)
 
 // Custom implementation of InspectorController functions
+DECLARE_CALLBACK(InspectorControllerProfiles)
+DECLARE_CALLBACK(InspectorControllerHighlightDOMNode)
+DECLARE_CALLBACK(InspectorControllerAddResourceSourceToFrame)
+DECLARE_CALLBACK(InspectorControllerGetResourceDocumentNode)
+DECLARE_CALLBACK(InspectorControllerAddSourceToFrame)
+DECLARE_CALLBACK(InspectorControllerSearch)
+DECLARE_CALLBACK(InspectorControllerSetting)
+DECLARE_CALLBACK(InspectorControllerInspectedWindow)
+DECLARE_CALLBACK(InspectorControllerSetSetting)
+DECLARE_CALLBACK(InspectorControllerCurrentCallFrame)
 DECLARE_CALLBACK(InspectorControllerDebuggerEnabled)
 DECLARE_CALLBACK(InspectorControllerPauseOnExceptions)
 DECLARE_CALLBACK(InspectorControllerProfilerEnabled)