Abstract out ThreadDebugger from V8PerIsolateData

third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/SourceLocation.h"
 
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ScriptableDocumentParser.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/inspector/ThreadDebugger.h"
 #include "core/inspector/V8InspectorString.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/instrumentation/tracing/TracedValue.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
 std::unique_ptr<v8_inspector::V8StackTrace> captureStackTrace(bool full) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  V8PerIsolateData* data = V8PerIsolateData::from(isolate);
-  if (!data->threadDebugger() || !isolate->InContext())
+  ThreadDebugger* debugger = ThreadDebugger::from(isolate);
+  if (!debugger || !isolate->InContext())
     return nullptr;
   ScriptForbiddenScope::AllowUserAgentScript allowScripting;
-  return data->threadDebugger()->v8Inspector()->captureStackTrace(full);
+  return debugger->v8Inspector()->captureStackTrace(full);
 }
 }
 
 // static
 std::unique_ptr<SourceLocation> SourceLocation::capture(const String& url,
                                                         unsigned lineNumber,
                                                         unsigned columnNumber) {
   std::unique_ptr<v8_inspector::V8StackTrace> stackTrace =
       captureStackTrace(false);
   if (stackTrace && !stackTrace->isEmpty())
@@ skipping 32 matching lines @@
       std::move(stackTrace));
 }
 
 // static
 std::unique_ptr<SourceLocation> SourceLocation::fromMessage(
     v8::Isolate* isolate,
     v8::Local<v8::Message> message,
     ExecutionContext* executionContext) {
   v8::Local<v8::StackTrace> stack = message->GetStackTrace();
   std::unique_ptr<v8_inspector::V8StackTrace> stackTrace = nullptr;
-  V8PerIsolateData* data = V8PerIsolateData::from(isolate);
-  if (data && data->threadDebugger())
-    stackTrace = data->threadDebugger()->v8Inspector()->createStackTrace(stack);
+  ThreadDebugger* debugger = ThreadDebugger::from(isolate);
+  if (debugger)
+    stackTrace = debugger->v8Inspector()->createStackTrace(stack);
 
   int scriptId = message->GetScriptOrigin().ScriptID()->Value();
   if (!stack.IsEmpty() && stack->GetFrameCount() > 0) {
     int topScriptId = stack->GetFrame(0)->GetScriptId();
     if (topScriptId == scriptId)
       scriptId = 0;
   }
 
   int lineNumber = 0;
   int columnNumber = 0;
@@ skipping 100 matching lines @@
   return m_stackTrace ? m_stackTrace->buildInspectorObject() : nullptr;
 }
 
 String SourceLocation::toString() const {
   if (!m_stackTrace)
     return String();
   return toCoreString(m_stackTrace->toString());
 }
 
 }  // namespace blink