Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp

Issue 1601283003: DevTools: deoilpanize inspector/v8 and related classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments addressed. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
index ef29fe655cf3d4b810d54ab6055de29c7a1a553b..25ac07522605759cd30a40ebd8327655167d68bd 100644
--- a/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
+++ b/third_party/WebKit/Source/core/inspector/InjectedScriptHost.cpp
@@ -42,36 +42,29 @@
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;
}
@@ -90,10 +83,8 @@ void InjectedScriptHost::getEventListenersImpl(EventTarget* target, WillBeHeapVe
void InjectedScriptHost::clearConsoleMessages()
{
- if (m_consoleAgent) {
- ErrorString error;
- m_consoleAgent->clearMessages(&error);
- }
+ if (m_clearConsoleCallback)
+ (*m_clearConsoleCallback)();
}
ScriptValue InjectedScriptHost::InspectableObject::get(ScriptState*)
@@ -101,7 +92,7 @@ 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)

Powered by Google App Engine
This is Rietveld 408576698