Changeset 31950 in webkit

Timestamp:

Apr 16, 2008 12:18:11 PM (16 years ago)

Author:

Adam Roben

Message:

Pass JSConsole's arguments unmodified to Console

Part of Bug 17228: console.{log,warn,info,error} should support format
strings, variable arguments
<​http://bugs.webkit.org/show_bug.cgi?id=17228>
<rdar://problem/5732828>

All of JSConsole's methods are now custom, so that we can pass the
arguments unmodified to Console. Console now handles calling
toString() on the first argument. Later it will pass the arguments off
to InspectorController.

There should be no behavioral changes caused by this patch.

Reviewed by Darin Adler.

• ForwardingHeaders/kjs/list.h: Added.
• GNUmakefile.am: Added JSConsoleCustom.cpp to the project.
• WebCore.pro: Ditto.
• WebCore.vcproj/WebCore.vcproj: Ditto.
• WebCore.xcodeproj/project.pbxproj: Ditto.
• WebCoreSources.bkl: Ditto.
• bindings/js/JSConsoleCustom.cpp: Added. (WebCore::JSConsole::error): (WebCore::JSConsole::info): (WebCore::JSConsole::log): (WebCore::JSConsole::warn):
• page/Console.cpp: Changed all methods to take an ExecState* and a const List&. The first item in the List is toString()ed and passed to Chrome. (WebCore::Console::error): (WebCore::Console::info): (WebCore::Console::log): (WebCore::Console::warn):
• page/Console.h:
• page/Console.idl:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• ForwardingHeaders/kjs/list.h (added)
• GNUmakefile.am (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCoreSources.bkl (modified) (1 diff)
• bindings/js/JSConsoleCustom.cpp (added)
• page/Console.cpp (modified) (6 diffs)
• page/Console.h (modified) (2 diffs)
• page/Console.idl (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-15  Adam Roben  <aroben@apple.com>
+
+        Pass JSConsole's arguments unmodified to Console
+
+        Part of Bug 17228: console.{log,warn,info,error} should support format
+        strings, variable arguments
+        <http://bugs.webkit.org/show_bug.cgi?id=17228>
+        <rdar://problem/5732828>
+
+        All of JSConsole's methods are now custom, so that we can pass the
+        arguments unmodified to Console. Console now handles calling
+        toString() on the first argument. Later it will pass the arguments off
+        to InspectorController.
+
+        There should be no behavioral changes caused by this patch.
+
+        Reviewed by Darin Adler.
+
+        * ForwardingHeaders/kjs/list.h: Added.
+        * GNUmakefile.am: Added JSConsoleCustom.cpp to the project.
+        * WebCore.pro: Ditto.
+        * WebCore.vcproj/WebCore.vcproj: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+        * WebCoreSources.bkl: Ditto.
+        * bindings/js/JSConsoleCustom.cpp: Added.
+        (WebCore::JSConsole::error):
+        (WebCore::JSConsole::info):
+        (WebCore::JSConsole::log):
+        (WebCore::JSConsole::warn):
+        * page/Console.cpp: Changed all methods to take an ExecState* and a
+        const List&. The first item in the List is toString()ed and passed to
+        Chrome.
+        (WebCore::Console::error):
+        (WebCore::Console::info):
+        (WebCore::Console::log):
+        (WebCore::Console::warn):
+        * page/Console.h:
+        * page/Console.idl:
+
 2008-04-16  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/GNUmakefile.am

@@ -474 +474 @@
         WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp \
         WebCore/bindings/js/JSClipboardCustom.cpp \
+        WebCore/bindings/js/JSConsoleCustom.cpp \
         WebCore/bindings/js/JSCSSRuleCustom.cpp \
         WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp \

trunk/WebCore/WebCore.pro

@@ -406 +406 @@
     bindings/js/JSCanvasRenderingContext2DCustom.cpp \
     bindings/js/JSClipboardCustom.cpp \
+    bindings/js/JSConsoleCustom.cpp \
     bindings/js/JSCSSRuleCustom.cpp \
     bindings/js/JSCSSStyleDeclarationCustom.cpp \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -13095 +13095 @@
                                 </File>
                                 <File
+                                        RelativePath="..\bindings\js\JSConsoleCustom.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\bindings\js\JSCSSRuleCustom.cpp"
                                         >
@@ -15700 +15704 @@
                                 <File
                                         RelativePath="..\ForwardingHeaders\kjs\JSLock.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\ForwardingHeaders\kjs\list.h"
                                         >
                                 </File>

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3848 +3848 @@
                 C091588E0DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C09158880DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp */; };
                 C091588F0DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = C09158890DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h */; };
+                C0DFC8700DB6841A003EAE7C /* JSConsoleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */; };
                 C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */; };
                 C6D74AE409AA290A000B0A52 /* ModifySelectionListLevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */; };
@@ -8137 +8138 @@
                 C09158880DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSQuarantinedObjectWrapper.cpp; sourceTree = "<group>"; };
                 C09158890DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQuarantinedObjectWrapper.h; sourceTree = "<group>"; };
+                C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSConsoleCustom.cpp; sourceTree = "<group>"; };
                 C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifySelectionListLevel.h; sourceTree = "<group>"; };
                 C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModifySelectionListLevel.cpp; sourceTree = "<group>"; };
@@ -11973 +11975 @@
                                 E4EEFFC60D34550C00469A58 /* JSAudioConstructor.cpp */,
                                 E4EEFFC70D34550C00469A58 /* JSAudioConstructor.h */,
+                                C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */,
                                 E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
                                 E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
@@ -16590 +16593 @@
                                 1A8F6BC20DB55CDC001DB794 /* DOMApplicationCache.cpp in Sources */,
                                 1A8F6BC50DB55CDC001DB794 /* ManifestParser.cpp in Sources */,
+                                C0DFC8700DB6841A003EAE7C /* JSConsoleCustom.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/WebCoreSources.bkl

@@ -40 +40 @@
         bindings/js/JSCanvasRenderingContext2DCustom.cpp
         bindings/js/JSClipboardCustom.cpp
+        bindings/js/JSConsoleCustom.cpp
         bindings/js/JSCSSRuleCustom.cpp
         bindings/js/JSCSSStyleDeclarationCustom.cpp

trunk/WebCore/page/Console.cpp

@@ -35 +35 @@
 #include "Page.h"
 #include "PlatformString.h"
+#include <kjs/list.h>
+
+using namespace KJS;
 
 namespace WebCore {
@@ -48 +51 @@
 }
 
-void Console::error(const String& message)
+void Console::error(ExecState* exec, const List& arguments)
 {
+    if (arguments.isEmpty())
+        return;
+
     if (!m_frame)
         return;
@@ -57 +63 @@
         return;
 
-    page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, 0, m_frame->loader()->url().prettyURL());
+    page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
 }
 
-void Console::info(const String& message)
+void Console::info(ExecState* exec, const List& arguments)
 {
+    if (arguments.isEmpty())
+        return;
+
     if (!m_frame)
         return;
@@ -69 +78 @@
         return;
 
-    page->chrome()->addMessageToConsole(JSMessageSource, LogMessageLevel, message, 0, m_frame->loader()->url().prettyURL());
+    page->chrome()->addMessageToConsole(JSMessageSource, LogMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
 }
 
-void Console::log(const String& message)
+void Console::log(ExecState* exec, const List& arguments)
 {
+    if (arguments.isEmpty())
+        return;
+
     if (!m_frame)
         return;
@@ -81 +93 @@
         return;
 
-    page->chrome()->addMessageToConsole(JSMessageSource, LogMessageLevel, message, 0, m_frame->loader()->url().prettyURL());
+    page->chrome()->addMessageToConsole(JSMessageSource, LogMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
 }
 
-void Console::warn(const String& message)
+void Console::warn(ExecState* exec, const List& arguments)
 {
+    if (arguments.isEmpty())
+        return;
+
     if (!m_frame)
         return;
@@ -93 +108 @@
         return;
 
-    page->chrome()->addMessageToConsole(JSMessageSource, WarningMessageLevel, message, 0, m_frame->loader()->url().prettyURL());
+    page->chrome()->addMessageToConsole(JSMessageSource, WarningMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
 }
 

trunk/WebCore/page/Console.h

@@ -31 +31 @@
 
 #include <wtf/RefCounted.h>
-#include "PlatformString.h"
+
+#include <wtf/PassRefPtr.h>
+
+namespace KJS {
+    class ExecState;
+    class List;
+}
 
 namespace WebCore {
@@ -43 +49 @@
         void disconnectFrame();
 
-        void error(const String& message);
-        void info(const String& message);
-        void log(const String& message);
-        void warn(const String& message);
+        void error(KJS::ExecState*, const KJS::List& arguments);
+        void info(KJS::ExecState*, const KJS::List& arguments);
+        void log(KJS::ExecState*, const KJS::List& arguments);
+        void warn(KJS::ExecState*, const KJS::List& arguments);
 
     private:

trunk/WebCore/page/Console.idl

@@ -1 +1 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +30 @@
 
     interface Console {
-        void error(in DOMString message);
-        void info(in DOMString message);
-        void log(in DOMString message);
-        void warn(in DOMString message);
+        [Custom] void error();
+        [Custom] void info();
+        [Custom] void log();
+        [Custom] void warn();
     };