Cleanup ConsoleMessage interface.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ConsoleMessage_h
 #define ConsoleMessage_h
 
+#include "bindings/core/v8/ScriptCallStack.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/CoreExport.h"
 #include "platform/heap/Handle.h"
 #include "platform/v8_inspector/public/ConsoleAPITypes.h"
 #include "platform/v8_inspector/public/ConsoleTypes.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class ScriptArguments;
-class ScriptCallStack;
 class ScriptState;
 class WorkerInspectorProxy;
 
 class CORE_EXPORT ConsoleMessage final: public GarbageCollectedFinalized<ConsoleMessage> {
 public:
-    static ConsoleMessage* create(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber = 0)
-    {
-        return new ConsoleMessage(source, level, message, url, lineNumber, columnNumber);
-    }
+    // Callstack may be empty. Zero lineNumber or columnNumber means unknown.
+    static ConsoleMessage* create(MessageSource, MessageLevel, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, int scriptId = 0);
 
-    static ConsoleMessage* create(MessageSource source, MessageLevel level, const String& message)
-    {
-        ConsoleMessage* consoleMessage = new ConsoleMessage(source, level, message, String(), 0, 0);
-        consoleMessage->collectCallStack();
-        return consoleMessage;
-    }
+    // Shortcut when callstack is unavailable.
+    static ConsoleMessage* create(MessageSource, MessageLevel, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber);
+
+    // This method tries to capture callstack if possible and falls back to provided location.
+    static ConsoleMessage* createWithCallStack(MessageSource, MessageLevel, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber);
+
+    // Shortcut when location is unavailable. This method captures callstack.
+    static ConsoleMessage* create(MessageSource, MessageLevel, const String& message);
 
     ~ConsoleMessage();
 
     MessageType type() const;
     void setType(MessageType);
     int scriptId() const;
-    void setScriptId(int);
     const String& url() const;
     void setURL(const String&);
     unsigned lineNumber() const;
     void setLineNumber(unsigned);
     unsigned columnNumber() const;
     void setColumnNumber(unsigned);
     PassRefPtr<ScriptCallStack> callStack() const;
-    void setCallStack(PassRefPtr<ScriptCallStack>);
     ScriptState* getScriptState() const;
     void setScriptState(ScriptState*);
     ScriptArguments* scriptArguments() const;
     void setScriptArguments(ScriptArguments*);
     unsigned long requestIdentifier() const;
     void setRequestIdentifier(unsigned long);
     double timestamp() const;
     void setTimestamp(double);
     WorkerInspectorProxy* workerInspectorProxy() { return m_workerProxy; }
     void setWorkerInspectorProxy(WorkerInspectorProxy* proxy) { m_workerProxy = proxy; }
     unsigned assignMessageId();
     unsigned messageId() const { return m_messageId; }
     unsigned relatedMessageId() const { return m_relatedMessageId; }
     void setRelatedMessageId(unsigned relatedMessageId) { m_relatedMessageId = relatedMessageId; }
 
     MessageSource source() const;
     MessageLevel level() const;
     const String& message() const;
 
     void frameWindowDiscarded(LocalDOMWindow*);
     unsigned argumentCount();
 
-    void collectCallStack();
-
     DECLARE_TRACE();
 
 private:
-    ConsoleMessage(MessageSource, MessageLevel, const String& message, const String& url = String(), unsigned lineNumber = 0, unsigned columnNumber = 0);
+    ConsoleMessage(MessageSource, MessageLevel, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack>, int scriptId);
 
     MessageSource m_source;
     MessageLevel m_level;
     MessageType m_type;
     String m_message;
     int m_scriptId;
     String m_url;
     unsigned m_lineNumber;
     unsigned m_columnNumber;
     RefPtr<ScriptCallStack> m_callStack;
     OwnPtr<ScriptStateProtectingContext> m_scriptState;
     Member<ScriptArguments> m_scriptArguments;
     unsigned long m_requestIdentifier;
     double m_timestamp;
     Member<WorkerInspectorProxy> m_workerProxy;
     unsigned m_messageId;
     unsigned m_relatedMessageId;
 };
 
 } // namespace blink
 
 #endif // ConsoleMessage_h