[DevTools] ConsoleAPI messages pass through frame console

Source/core/inspector/ConsoleMessage.h

Index: Source/core/inspector/ConsoleMessage.h
diff --git a/Source/core/inspector/ConsoleMessage.h b/Source/core/inspector/ConsoleMessage.h
index bb5383932f7bcf1dd04b18740ecbe9a668b5202a..8c64f04b7dd4ad3c292b27decc460d5763000b5a 100644
--- a/Source/core/inspector/ConsoleMessage.h
+++ b/Source/core/inspector/ConsoleMessage.h
@@ -7,6 +7,8 @@
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/frame/ConsoleTypes.h"
+#include "core/inspector/ConsoleAPITypes.h"
+#include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
@@ -27,40 +29,43 @@ public:
         return adoptRefWillBeNoop(new ConsoleMessage(source, level, message, url, lineNumber, columnNumber));
     }
 
-    ~ConsoleMessage();
-
+    MessageType type() const;
+    void setType(MessageType);
+    const String& url() const;
+    void setURL(const String&);
+    unsigned lineNumber() const;
+    void setLineNumber(unsigned);
     PassRefPtrWillBeRawPtr<ScriptCallStack> callStack() const;
     void setCallStack(PassRefPtrWillBeRawPtr<ScriptCallStack>);
     ScriptState* scriptState() const;
     void setScriptState(ScriptState*);
+    PassRefPtr<ScriptArguments> scriptArguments() const;
+    void setScriptArguments(PassRefPtr<ScriptArguments>);
     unsigned long requestIdentifier() const;
     void setRequestIdentifier(unsigned long);
-    const String& url() const;
-    void setURL(const String&);
-    unsigned lineNumber() const;
-    void setLineNumber(unsigned);
+    WorkerGlobalScopeProxy* workerId() { return m_workerProxy; }
+    void setWorkerId(WorkerGlobalScopeProxy* proxy) { m_workerProxy = proxy; }
 
     MessageSource source() const;
     MessageLevel level() const;
     const String& message() const;
     unsigned columnNumber() const;
-    void setWorkerId(WorkerGlobalScopeProxy* proxy) { m_workerProxy = proxy; }
-    WorkerGlobalScopeProxy* workerId() { return m_workerProxy; }
 
     void trace(Visitor*);
 
 private:
-    ConsoleMessage();
     ConsoleMessage(MessageSource, MessageLevel, const String& message, const String& url = String(), unsigned lineNumber = 0, unsigned columnNumber = 0);
 
     MessageSource m_source;
     MessageLevel m_level;
+    MessageType m_type;
     String m_message;
     String m_url;
     unsigned m_lineNumber;
     unsigned m_columnNumber;
     RefPtrWillBeMember<ScriptCallStack> m_callStack;
-    ScriptState* m_scriptState;
+    OwnPtr<ScriptStateProtectingContext> m_scriptState;

[vsevik, 2014/08/18 18:41:06]

You don't need OwnPtr here, ScriptStateProtectingContext m_scriptState is
enough.

[kozyatinskiy1, 2014/08/19 07:31:06]

I can't support setScriptState without OwnPtr. ScriptStateProtectingContext have
constructor(ScriptState*) and no ScriptState setter or copy constructor. So I
cann't change the value of ScriptState* pointer in protecting context.

+    RefPtr<ScriptArguments> m_scriptArguments;
     unsigned long m_requestIdentifier;
     WorkerGlobalScopeProxy* m_workerProxy;
 };