Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/inspector/ConsoleMessage.h

Index: sky/engine/core/inspector/ConsoleMessage.h
diff --git a/sky/engine/core/inspector/ConsoleMessage.h b/sky/engine/core/inspector/ConsoleMessage.h
index fe85fb7b32126777028b6b889ddbde41a73a26f4..ec83c01201d7ecf770f7dabe5b97d9758822e1f3 100644
--- a/sky/engine/core/inspector/ConsoleMessage.h
+++ b/sky/engine/core/inspector/ConsoleMessage.h
@@ -5,7 +5,6 @@
 #ifndef SKY_ENGINE_CORE_INSPECTOR_CONSOLEMESSAGE_H_
 #define SKY_ENGINE_CORE_INSPECTOR_CONSOLEMESSAGE_H_
 
-#include "sky/engine/bindings/core/v8/ScriptState.h"
 #include "sky/engine/core/frame/ConsoleTypes.h"
 #include "sky/engine/core/inspector/ConsoleAPITypes.h"
 #include "sky/engine/core/inspector/ScriptCallStack.h"
@@ -17,10 +16,6 @@
 
 namespace blink {
 
-class ScriptArguments;
-class ScriptCallStack;
-class ScriptState;
-
 class ConsoleMessage final: public RefCounted<ConsoleMessage> {
 public:
     static PassRefPtr<ConsoleMessage> create(MessageSource source, MessageLevel level, const String& message, const String& url = String(), unsigned lineNumber = 0, unsigned columnNumber = 0)
@@ -37,12 +32,6 @@ public:
     void setURL(const String&);
     unsigned lineNumber() const;
     void setLineNumber(unsigned);
-    PassRefPtr<ScriptCallStack> callStack() const;
-    void setCallStack(PassRefPtr<ScriptCallStack>);
-    ScriptState* scriptState() const;
-    void setScriptState(ScriptState*);
-    PassRefPtr<ScriptArguments> scriptArguments() const;
-    void setScriptArguments(PassRefPtr<ScriptArguments>);
     unsigned long requestIdentifier() const;
     void setRequestIdentifier(unsigned long);
     double timestamp() const;
@@ -53,11 +42,6 @@ public:
     const String& message() const;
     unsigned columnNumber() const;
 
-    void frameWindowDiscarded(LocalDOMWindow*);
-    unsigned argumentCount();
-
-    void collectCallStack();
-
 private:
     ConsoleMessage(MessageSource, MessageLevel, const String& message, const String& url = String(), unsigned lineNumber = 0, unsigned columnNumber = 0);
 
@@ -69,9 +53,6 @@ private:
     String m_url;
     unsigned m_lineNumber;
     unsigned m_columnNumber;
-    RefPtr<ScriptCallStack> m_callStack;
-    OwnPtr<ScriptStateProtectingContext> m_scriptState;
-    RefPtr<ScriptArguments> m_scriptArguments;
     unsigned long m_requestIdentifier;
     double m_timestamp;
 };