diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/page/Console.h | |
parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/page/Console.h')
-rw-r--r-- | WebCore/page/Console.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/WebCore/page/Console.h b/WebCore/page/Console.h index 92fee59..19f1a57 100644 --- a/WebCore/page/Console.h +++ b/WebCore/page/Console.h @@ -87,31 +87,31 @@ public: void disconnectFrame(); 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>); + void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack); + + void debug(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void error(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void info(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void log(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void warn(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void dir(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void dirxml(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void trace(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void assertCondition(bool condition, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void count(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void markTimeline(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); #if ENABLE(WML) String lastWMLErrorMessage() const; #endif #if ENABLE(JAVASCRIPT_DEBUGGER) const ProfilesArray& profiles() const { return m_profiles; } - void profile(const String&, ScriptState*, PassOwnPtr<ScriptCallStack>); - void profileEnd(const String&, ScriptState*, PassOwnPtr<ScriptCallStack>); + void profile(const String&, ScriptState*, PassRefPtr<ScriptCallStack>); + void profileEnd(const String&, ScriptState*, PassRefPtr<ScriptCallStack>); #endif void time(const String&); - void timeEnd(const String&, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>); - void group(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>); - void groupCollapsed(PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>); + void timeEnd(const String&, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void group(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); + void groupCollapsed(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); void groupEnd(); bool shouldCaptureFullStackTrace() const; @@ -123,7 +123,7 @@ public: private: inline Page* page() const; - void addMessage(MessageType, MessageLevel, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>, bool acceptNoArguments = false); + void addMessage(MessageType, MessageLevel, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>, bool acceptNoArguments = false); Console(Frame*); |