Abstract out ThreadDebugger from V8PerIsolateData

third_party/WebKit/Source/core/inspector/ThreadDebugger.h

Index: third_party/WebKit/Source/core/inspector/ThreadDebugger.h
diff --git a/third_party/WebKit/Source/core/inspector/ThreadDebugger.h b/third_party/WebKit/Source/core/inspector/ThreadDebugger.h
index 6d49f1f590466978ce8276c9e798ec15d6f59bd3..1053ec692136faa6f2c610622cbdf3f64e55afe8 100644
--- a/third_party/WebKit/Source/core/inspector/ThreadDebugger.h
+++ b/third_party/WebKit/Source/core/inspector/ThreadDebugger.h
@@ -5,16 +5,17 @@
 #ifndef ThreadDebugger_h
 #define ThreadDebugger_h
 
+#include <v8-inspector.h>
+#include <v8-profiler.h>
+#include <v8.h>
+#include <memory>
+#include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/CoreExport.h"
 #include "core/inspector/ConsoleTypes.h"
 #include "platform/Timer.h"
 #include "platform/UserGestureIndicator.h"
 #include "wtf/Forward.h"
 #include "wtf/Vector.h"
-#include <memory>
-#include <v8-inspector.h>
-#include <v8-profiler.h>
-#include <v8.h>
 
 namespace blink {
 
@@ -22,7 +23,8 @@ class ExecutionContext;
 class SourceLocation;
 
 // TODO(dgozman): rename this to ThreadInspector (and subclasses).
-class CORE_EXPORT ThreadDebugger : public v8_inspector::V8InspectorClient {
+class CORE_EXPORT ThreadDebugger : public v8_inspector::V8InspectorClient,
+                                   public V8PerIsolateData::Data {
   WTF_MAKE_NONCOPYABLE(ThreadDebugger);
 
  public:
@@ -33,6 +35,9 @@ class CORE_EXPORT ThreadDebugger : public v8_inspector::V8InspectorClient {
   virtual bool isWorker() = 0;
   v8_inspector::V8Inspector* v8Inspector() const { return m_v8Inspector.get(); }
 
+  static void setThreadDebugger(v8::Isolate*, ThreadDebugger*);
+  static ThreadDebugger* getThreadDebugger(v8::Isolate*);

[jbroman, 2017/02/15 02:25:23]

This looks equivalent to ThreadDebugger::from, above.

[adithyas, 2017/02/15 18:12:12]

Yup, don't know why I added this.

+
   static void willExecuteScript(v8::Isolate*, int scriptId);
   static void didExecuteScript(v8::Isolate*);
   static void idleStarted(v8::Isolate*);