DevTools: deoilpanize inspector/v8 and related classes.

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 24 matching lines @@
 #include "core/inspector/InspectorConsoleAgent.h"
 #include "core/inspector/v8/V8Debugger.h"
 #include "core/inspector/v8/V8DebuggerAgent.h"
 #include "platform/JSONValues.h"
 
 #include "wtf/RefPtr.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<InjectedScriptHost> InjectedScriptHost::create()
+PassRefPtr<InjectedScriptHost> InjectedScriptHost::create()
 {
-    return adoptRefWillBeNoop(new InjectedScriptHost());
+    return adoptRef(new InjectedScriptHost());
 }
 
 InjectedScriptHost::InjectedScriptHost()
-    : m_consoleAgent(nullptr)
-    , m_debuggerAgent(nullptr)
+    : m_debuggerAgent(nullptr)
     , m_inspectCallback(nullptr)
+    , m_clearConsoleCallback(nullptr)
     , m_debugger(nullptr)
 {
-    m_defaultInspectableObject = adoptPtrWillBeNoop(new InspectableObject());
+    m_defaultInspectableObject = adoptPtr(new InspectableObject());
 }
 
 InjectedScriptHost::~InjectedScriptHost()
 {
 }
 
-DEFINE_TRACE(InjectedScriptHost)
-{
-    visitor->trace(m_consoleAgent);
-    visitor->trace(m_inspectedObjects);
-    visitor->trace(m_defaultInspectableObject);
-}
-
 void InjectedScriptHost::disconnect()
 {
-    m_consoleAgent = nullptr;
     m_debuggerAgent = nullptr;
     m_inspectCallback = nullptr;
+    m_clearConsoleCallback = nullptr;
     m_debugger = nullptr;
 }
 
 void InjectedScriptHost::inspectImpl(PassRefPtr<JSONValue> object, PassRefPtr<JSONValue> hints)
 {
     if (m_inspectCallback) {
         RefPtr<TypeBuilder::Runtime::RemoteObject> remoteObject = TypeBuilder::Runtime::RemoteObject::runtimeCast(object);
         (*m_inspectCallback)(remoteObject, hints->asObject());
     }
 }
 
 void InjectedScriptHost::getEventListenersImpl(EventTarget* target, WillBeHeapVector<EventListenerInfo>& listenersArray)
 {
     EventListenerInfo::getEventListeners(target, listenersArray, false);
 }
 
 void InjectedScriptHost::clearConsoleMessages()
 {
-    if (m_consoleAgent) {
-        ErrorString error;
-        m_consoleAgent->clearMessages(&error);
-    }
+    if (m_clearConsoleCallback)
+        (*m_clearConsoleCallback)();
 }
 
 ScriptValue InjectedScriptHost::InspectableObject::get(ScriptState*)
 {
     return ScriptValue();
 };
 
-void InjectedScriptHost::addInspectedObject(PassOwnPtrWillBeRawPtr<InjectedScriptHost::InspectableObject> object)
+void InjectedScriptHost::addInspectedObject(PassOwnPtr<InjectedScriptHost::InspectableObject> object)
 {
     m_inspectedObjects.prepend(object);
     while (m_inspectedObjects.size() > 5)
         m_inspectedObjects.removeLast();
 }
 
 void InjectedScriptHost::clearInspectedObjects()
 {
     m_inspectedObjects.clear();
 }
@@ skipping 30 matching lines @@
         m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, V8DebuggerAgent::MonitorCommandBreakpointSource, builder.toString());
 }
 
 void InjectedScriptHost::unmonitorFunction(const String& scriptId, int lineNumber, int columnNumber)
 {
     if (m_debuggerAgent)
         m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, V8DebuggerAgent::MonitorCommandBreakpointSource);
 }
 
 } // namespace blink