1 files changed, 26 insertions, 23 deletions

diff --git a/WebCore/page/Console.h b/WebCore/page/Console.h
index ab62525..92fee59 100644
--- a/WebCore/page/Console.h
+++ b/WebCore/page/Console.h
@@ -32,6 +32,7 @@
 #include "MemoryInfo.h"
 #include "PlatformString.h"
 #include "ScriptProfile.h"
+#include "ScriptState.h"
 
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
@@ -39,6 +40,8 @@
 
 namespace WebCore {
 
+class ScriptArguments;
+
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 typedef Vector<RefPtr<ScriptProfile> > ProfilesArray;
 #endif
@@ -83,44 +86,44 @@ public:
     Frame* frame() const;
     void disconnectFrame();
 
-    void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL, ScriptCallStack* callStack = 0);
-
-    void debug(ScriptCallStack*);
-    void error(ScriptCallStack*);
-    void info(ScriptCallStack*);
-    void log(ScriptCallStack*);
-    void warn(ScriptCallStack*);
-    void dir(ScriptCallStack*);
-    void dirxml(ScriptCallStack*);
-    void trace(ScriptCallStack*);
-    void assertCondition(bool condition, ScriptCallStack*);
-    void count(ScriptCallStack*);
-    void markTimeline(ScriptCallStack*);
+    void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL);
+    void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL, PassOwnPtr<ScriptCallStack> callStack);
+
+    void debug(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void error(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void info(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void log(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void warn(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void dir(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void dirxml(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void trace(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void assertCondition(bool condition, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void count(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void markTimeline(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
 #if ENABLE(WML)
     String lastWMLErrorMessage() const;
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    void profile(const String&, ScriptCallStack*);
-    void profileEnd(const String&, ScriptCallStack*);
+    const ProfilesArray& profiles() const { return m_profiles; }
+    void profile(const String&, ScriptState*, PassOwnPtr<ScriptCallStack>);
+    void profileEnd(const String&, ScriptState*, PassOwnPtr<ScriptCallStack>);
 #endif
     void time(const String&);
-    void timeEnd(const String&, ScriptCallStack*);
-    void group(ScriptCallStack*);
-    void groupCollapsed(ScriptCallStack*);
+    void timeEnd(const String&, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void group(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
+    void groupCollapsed(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>);
     void groupEnd();
 
+    bool shouldCaptureFullStackTrace() const;
+
     static bool shouldPrintExceptions();
     static void setShouldPrintExceptions(bool);
 
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-    const ProfilesArray& profiles() const { return m_profiles; }
-#endif
-
     MemoryInfo* memory() const;
 
 private:
     inline Page* page() const;
-    void addMessage(MessageType, MessageLevel, ScriptCallStack*, bool acceptNoArguments = false);
+    void addMessage(MessageType, MessageLevel, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>, bool acceptNoArguments = false);
 
     Console(Frame*);