| OLD | NEW |
| 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "core/inspector/InspectorConsoleAgent.h" | 34 #include "core/inspector/InspectorConsoleAgent.h" |
| 35 #include "wtf/PassOwnPtr.h" | 35 #include "wtf/PassOwnPtr.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 class InspectorDOMAgent; | 39 class InspectorDOMAgent; |
| 40 | 40 |
| 41 class PageConsoleAgent : public InspectorConsoleAgent { | 41 class PageConsoleAgent : public InspectorConsoleAgent { |
| 42 WTF_MAKE_NONCOPYABLE(PageConsoleAgent); | 42 WTF_MAKE_NONCOPYABLE(PageConsoleAgent); |
| 43 public: | 43 public: |
| 44 static PassOwnPtr<PageConsoleAgent> create(InstrumentingAgents* instrumentin
gAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptMa
nager, InspectorDOMAgent* domAgent) | 44 static PassOwnPtr<PageConsoleAgent> create(InstrumentingAgents* instrumentin
gAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptMa
nager, InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent) |
| 45 { | 45 { |
| 46 return adoptPtr(new PageConsoleAgent(instrumentingAgents, state, injecte
dScriptManager, domAgent)); | 46 return adoptPtr(new PageConsoleAgent(instrumentingAgents, state, injecte
dScriptManager, domAgent, timelineAgent)); |
| 47 } | 47 } |
| 48 virtual ~PageConsoleAgent(); | 48 virtual ~PageConsoleAgent(); |
| 49 | 49 |
| 50 virtual bool isWorkerAgent() OVERRIDE { return false; } | 50 virtual bool isWorkerAgent() OVERRIDE { return false; } |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 PageConsoleAgent(InstrumentingAgents*, InspectorCompositeState*, InjectedScr
iptManager*, InspectorDOMAgent*); | 53 PageConsoleAgent(InstrumentingAgents*, InspectorCompositeState*, InjectedScr
iptManager*, InspectorDOMAgent*, InspectorTimelineAgent*); |
| 54 virtual void clearMessages(ErrorString*); | 54 virtual void clearMessages(ErrorString*); |
| 55 virtual void addInspectedNode(ErrorString*, int nodeId); | 55 virtual void addInspectedNode(ErrorString*, int nodeId); |
| 56 | 56 |
| 57 InspectorDOMAgent* m_inspectorDOMAgent; | 57 InspectorDOMAgent* m_inspectorDOMAgent; |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace WebCore | 60 } // namespace WebCore |
| 61 | 61 |
| 62 | 62 |
| 63 #endif // !defined(PageConsoleAgent_h) | 63 #endif // !defined(PageConsoleAgent_h) |
| OLD | NEW |