Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

1 files changed, 19 insertions, 19 deletions

diff --git a/WebCore/page/Console.h b/WebCore/page/Console.h
index 19f1a57..92fee59 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, 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>);
+    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)
     const ProfilesArray& profiles() const { return m_profiles; }
-    void profile(const String&, ScriptState*, PassRefPtr<ScriptCallStack>);
-    void profileEnd(const String&, ScriptState*, PassRefPtr<ScriptCallStack>);
+    void profile(const String&, ScriptState*, PassOwnPtr<ScriptCallStack>);
+    void profileEnd(const String&, ScriptState*, PassOwnPtr<ScriptCallStack>);
 #endif
     void time(const String&);
-    void timeEnd(const String&, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
-    void group(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
-    void groupCollapsed(PassRefPtr<ScriptArguments>, PassRefPtr<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;
@@ -123,7 +123,7 @@ public:
 
 private:
     inline Page* page() const;
-    void addMessage(MessageType, MessageLevel, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>, bool acceptNoArguments = false);
+    void addMessage(MessageType, MessageLevel, PassOwnPtr<ScriptArguments>, PassOwnPtr<ScriptCallStack>, bool acceptNoArguments = false);
 
     Console(Frame*);