Abstract out ThreadDebugger from V8PerIsolateData

third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

 /*
  * Copyright (c) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/inspector/MainThreadDebugger.h"
 
+#include <memory>
 #include "bindings/core/v8/BindingSecurity.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/V8ErrorHandler.h"
 #include "bindings/core/v8/V8Node.h"
 #include "bindings/core/v8/V8Window.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/ContainerNode.h"
 #include "core/dom/Document.h"
@@ skipping 15 matching lines @@
 #include "core/inspector/InspectorTaskRunner.h"
 #include "core/inspector/V8InspectorString.h"
 #include "core/inspector/protocol/Protocol.h"
 #include "core/timing/MemoryInfo.h"
 #include "core/workers/MainThreadWorkletGlobalScope.h"
 #include "core/xml/XPathEvaluator.h"
 #include "core/xml/XPathResult.h"
 #include "platform/UserGestureIndicator.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/ThreadingPrimitives.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 int frameId(LocalFrame* frame) {
   ASSERT(frame);
   return WeakIdentifierMap<LocalFrame>::identifier(frame);
 }
 
@@ skipping 130 matching lines @@
         location->scriptId());
   }
 }
 
 int MainThreadDebugger::contextGroupId(LocalFrame* frame) {
   LocalFrame* localFrameRoot = frame->localFrameRoot();
   return frameId(localFrameRoot);
 }
 
 MainThreadDebugger* MainThreadDebugger::instance() {
-  ASSERT(isMainThread());
-  V8PerIsolateData* data =
-      V8PerIsolateData::from(V8PerIsolateData::mainThreadIsolate());
-  ASSERT(data->threadDebugger() && !data->threadDebugger()->isWorker());
-  return static_cast<MainThreadDebugger*>(data->threadDebugger());
+  CHECK(isMainThread());

[Yuki, 2017/02/15 10:00:40]

ASSERT corresponds to DCHECK.
Is this change intentional?

By the way, RELEASE_ASSERT corresponds to CHECK.

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

Ah, my bad. Thanks!

+  ThreadDebugger* debugger =
+      ThreadDebugger::getThreadDebugger(V8PerIsolateData::mainThreadIsolate());
+  CHECK(debugger && !debugger->isWorker());

[Yuki, 2017/02/15 10:00:40]

Ditto.

+  return static_cast<MainThreadDebugger*>(debugger);
 }
 
 void MainThreadDebugger::interruptMainThreadAndRun(
     std::unique_ptr<InspectorTaskRunner::Task> task) {
   MutexLocker locker(creationMutex());
   if (s_instance) {
     s_instance->m_taskRunner->appendTask(std::move(task));
     s_instance->m_taskRunner->interruptAndRunAllTasksDontWait(
         s_instance->m_isolate);
   }
@@ skipping 226 matching lines @@
                context, nodes, index++,
                ToV8(node, info.Holder(), info.GetIsolate()))
                .FromMaybe(false))
         return;
     }
     info.GetReturnValue().Set(nodes);
   }
 }
 
 }  // namespace blink