DevTools: deoilpanize inspector/v8 and related classes.

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

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2009 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
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 39 matching lines @@
 class V8DebuggerAgent;
 class V8Debugger;
 
 class EventListenerInfo;
 
 // SECURITY NOTE: Although the InjectedScriptHost is intended for use solely by the inspector,
 // a reference to the InjectedScriptHost may be leaked to the page being inspected. Thus, the
 // InjectedScriptHost must never implemment methods that have more power over the page than the
 // page already has itself (e.g. origin restriction bypasses).
 
-class InjectedScriptHost : public RefCountedWillBeGarbageCollectedFinalized<InjectedScriptHost> {
+class InjectedScriptHost : public RefCounted<InjectedScriptHost> {
 public:
-    static PassRefPtrWillBeRawPtr<InjectedScriptHost> create();
+    static PassRefPtr<InjectedScriptHost> create();
     ~InjectedScriptHost();
-    DECLARE_TRACE();
 
     using InspectCallback = Function<void(PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObject>)>;
+    using ClearConsoleCallback = Function<void()>;
 
-    void init(InspectorConsoleAgent* consoleAgent, V8DebuggerAgent* debuggerAgent, PassOwnPtr<InspectCallback> inspectCallback, V8Debugger* debugger, PassOwnPtr<InjectedScriptHostClient> injectedScriptHostClient)
+    void init(V8DebuggerAgent* debuggerAgent, PassOwnPtr<InspectCallback> inspectCallback, PassOwnPtr<ClearConsoleCallback> clearConsoleCallback, V8Debugger* debugger, PassOwnPtr<InjectedScriptHostClient> injectedScriptHostClient)
     {
-        m_consoleAgent = consoleAgent;
         m_debuggerAgent = debuggerAgent;
         m_inspectCallback = std::move(inspectCallback);
+        m_clearConsoleCallback = std::move(clearConsoleCallback);
         m_debugger = debugger;
         m_client = std::move(injectedScriptHostClient);
     }
 
     static EventTarget* eventTargetFromV8Value(v8::Isolate*, v8::Local<v8::Value>);
 
     void disconnect();
 
-    class InspectableObject : public NoBaseWillBeGarbageCollectedFinalized<InspectableObject> {
-        USING_FAST_MALLOC_WILL_BE_REMOVED(InspectableObject);
+    class InspectableObject {
+        USING_FAST_MALLOC(InspectableObject);
     public:
         virtual ScriptValue get(ScriptState*);
         virtual ~InspectableObject() { }
-        DEFINE_INLINE_VIRTUAL_TRACE() { }
     };
-    void addInspectedObject(PassOwnPtrWillBeRawPtr<InspectableObject>);
+    void addInspectedObject(PassOwnPtr<InspectableObject>);
     void clearInspectedObjects();
     InspectableObject* inspectedObject(unsigned num);
 
     void inspectImpl(PassRefPtr<JSONValue> objectToInspect, PassRefPtr<JSONValue> hints);
     void getEventListenersImpl(EventTarget*, WillBeHeapVector<EventListenerInfo>& listenersArray);
 
     void clearConsoleMessages();
     void debugFunction(const String& scriptId, int lineNumber, int columnNumber);
     void undebugFunction(const String& scriptId, int lineNumber, int columnNumber);
     void monitorFunction(const String& scriptId, int lineNumber, int columnNumber, const String& functionName);
     void unmonitorFunction(const String& scriptId, int lineNumber, int columnNumber);
 
     V8Debugger& debugger() { return *m_debugger; }
     InjectedScriptHostClient* client() { return m_client.get(); }
 
     // FIXME: store this template in per isolate data
     void setWrapperTemplate(v8::Local<v8::FunctionTemplate> wrapperTemplate, v8::Isolate* isolate) { m_wrapperTemplate.Reset(isolate, wrapperTemplate); }
     v8::Local<v8::FunctionTemplate> wrapperTemplate(v8::Isolate* isolate) { return v8::Local<v8::FunctionTemplate>::New(isolate, m_wrapperTemplate); }
 
 private:
     InjectedScriptHost();
 
-    RawPtrWillBeMember<InspectorConsoleAgent> m_consoleAgent;
     V8DebuggerAgent* m_debuggerAgent;
     OwnPtr<InspectCallback> m_inspectCallback;
+    OwnPtr<ClearConsoleCallback> m_clearConsoleCallback;
     V8Debugger* m_debugger;
-    WillBeHeapVector<OwnPtrWillBeMember<InspectableObject>> m_inspectedObjects;
-    OwnPtrWillBeMember<InspectableObject> m_defaultInspectableObject;
+    Vector<OwnPtr<InspectableObject>> m_inspectedObjects;
+    OwnPtr<InspectableObject> m_defaultInspectableObject;
     OwnPtr<InjectedScriptHostClient> m_client;
     v8::Global<v8::FunctionTemplate> m_wrapperTemplate;
 };
 
 } // namespace blink
 
 #endif // InjectedScriptHost_h