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

Side by Side Diff: Source/core/inspector/InspectorConsoleAgent.h

Issue 1286343003: DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed dgozman's comments Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #include "core/InspectorFrontend.h" 29 #include "core/InspectorFrontend.h"
30 #include "core/inspector/InspectorBaseAgent.h" 30 #include "core/inspector/InspectorBaseAgent.h"
31 #include "wtf/Forward.h" 31 #include "wtf/Forward.h"
32 #include "wtf/Noncopyable.h" 32 #include "wtf/Noncopyable.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 class ConsoleMessage; 36 class ConsoleMessage;
37 class ConsoleMessageStorage; 37 class ConsoleMessageStorage;
38 class InjectedScriptManager; 38 class InjectedScriptManager;
39 class InspectorDebuggerAgent; 39 class V8DebuggerAgent;
40 40
41 typedef String ErrorString; 41 typedef String ErrorString;
42 42
43 class CORE_EXPORT InspectorConsoleAgent : public InspectorBaseAgent<InspectorCon soleAgent, InspectorFrontend::Console>, public InspectorBackendDispatcher::Conso leCommandHandler { 43 class CORE_EXPORT InspectorConsoleAgent : public InspectorBaseAgent<InspectorCon soleAgent, InspectorFrontend::Console>, public InspectorBackendDispatcher::Conso leCommandHandler {
44 WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent); 44 WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
45 public: 45 public:
46 explicit InspectorConsoleAgent(InjectedScriptManager*); 46 explicit InspectorConsoleAgent(InjectedScriptManager*);
47 ~InspectorConsoleAgent() override; 47 ~InspectorConsoleAgent() override;
48 DECLARE_VIRTUAL_TRACE(); 48 DECLARE_VIRTUAL_TRACE();
49 49
50 void setDebuggerAgent(InspectorDebuggerAgent* debuggerAgent) { m_debuggerAge nt = debuggerAgent; } 50 void setDebuggerAgent(V8DebuggerAgent* debuggerAgent) { m_debuggerAgent = de buggerAgent; }
51 51
52 void enable(ErrorString*) override; 52 void enable(ErrorString*) override;
53 bool enabled() { return m_enabled; } 53 bool enabled() { return m_enabled; }
54 54
55 void disable(ErrorString*) override; 55 void disable(ErrorString*) override;
56 void restore() final; 56 void restore() final;
57 57
58 void addMessageToConsole(ConsoleMessage*); 58 void addMessageToConsole(ConsoleMessage*);
59 void consoleMessagesCleared(); 59 void consoleMessagesCleared();
60 60
61 protected: 61 protected:
62 void sendConsoleMessageToFrontend(ConsoleMessage*, bool generatePreview); 62 void sendConsoleMessageToFrontend(ConsoleMessage*, bool generatePreview);
63 virtual ConsoleMessageStorage* messageStorage() = 0; 63 virtual ConsoleMessageStorage* messageStorage() = 0;
64 64
65 virtual void enableStackCapturingIfNeeded() = 0; 65 virtual void enableStackCapturingIfNeeded() = 0;
66 virtual void disableStackCapturingIfNeeded() = 0; 66 virtual void disableStackCapturingIfNeeded() = 0;
67 67
68 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager; 68 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
69 RawPtrWillBeMember<InspectorDebuggerAgent> m_debuggerAgent; 69 RawPtrWillBeMember<V8DebuggerAgent> m_debuggerAgent;
70 bool m_enabled; 70 bool m_enabled;
71 }; 71 };
72 72
73 } // namespace blink 73 } // namespace blink
74 74
75 75
76 #endif // !defined(InspectorConsoleAgent_h) 76 #endif // !defined(InspectorConsoleAgent_h)
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorBaseAgent.h ('k') | Source/core/inspector/InspectorConsoleAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698