| Index: Source/core/inspector/InspectorConsoleAgent.h
|
| diff --git a/Source/core/inspector/InspectorConsoleAgent.h b/Source/core/inspector/InspectorConsoleAgent.h
|
| index 676133f89880337eadb62055b8b5a7239dd3bc84..9ef7fbfadf708c75d25f7edf121a089ba0bfef52 100644
|
| --- a/Source/core/inspector/InspectorConsoleAgent.h
|
| +++ b/Source/core/inspector/InspectorConsoleAgent.h
|
| @@ -41,9 +41,11 @@
|
| namespace WebCore {
|
|
|
| class ConsoleMessage;
|
| +class InspectorConsoleMessage;
|
| class DocumentLoader;
|
| class LocalDOMWindow;
|
| class LocalFrame;
|
| +class InspectorConsoleMessage;
|
| class InspectorFrontend;
|
| class InjectedScriptManager;
|
| class InspectorTimelineAgent;
|
| @@ -76,11 +78,8 @@ public:
|
| virtual void clearFrontend() OVERRIDE FINAL;
|
| virtual void restore() OVERRIDE FINAL;
|
|
|
| + void addMessageToConsole(PassRefPtr<ConsoleMessage>);
|
| void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, ScriptState*, PassRefPtrWillBeRawPtr<ScriptArguments>, unsigned long requestIdentifier = 0);
|
| - void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber = 0, ScriptState* = 0, unsigned long requestIdentifier = 0);
|
| -
|
| - // FIXME: Remove once we no longer generate stacks outside of Inspector.
|
| - void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtrWillBeRawPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
|
|
|
| Vector<unsigned> consoleMessageArgumentCounts();
|
|
|
| @@ -106,12 +105,12 @@ public:
|
| virtual bool isWorkerAgent() = 0;
|
|
|
| protected:
|
| - void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
|
| + void addConsoleMessage(PassOwnPtr<InspectorConsoleMessage>);
|
|
|
| InspectorTimelineAgent* m_timelineAgent;
|
| InjectedScriptManager* m_injectedScriptManager;
|
| InspectorFrontend::Console* m_frontend;
|
| - Vector<OwnPtr<ConsoleMessage> > m_consoleMessages;
|
| + Vector<OwnPtr<InspectorConsoleMessage> > m_consoleMessages;
|
| int m_expiredConsoleMessageCount;
|
| HashCountedSet<String> m_counts;
|
| HashMap<String, double> m_times;
|
|
|