[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

pfeldman at chromium.org pfeldman at chromium.org
Thu Apr 8 00:14:37 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit eaf2e4ae134dbd22ed59d513cf2938c3cf14f4ac
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 18:04:54 2009 +0000

    2009-12-03  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: chromium build fix.
            r51621 changed JS bindings only, broke v8's.
    
            * bindings/v8/ScriptFunctionCall.cpp:
            (WebCore::ScriptFunctionCall::appendArgument):
            * bindings/v8/ScriptFunctionCall.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index af6e9e5..1a7d5b0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-03  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: chromium build fix.
+        r51621 changed JS bindings only, broke v8's.
+
+        * bindings/v8/ScriptFunctionCall.cpp:
+        (WebCore::ScriptFunctionCall::appendArgument):
+        * bindings/v8/ScriptFunctionCall.h:
+
 2009-12-03  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/bindings/v8/ScriptFunctionCall.cpp b/WebCore/bindings/v8/ScriptFunctionCall.cpp
index 7930b7b..a232acd 100644
--- a/WebCore/bindings/v8/ScriptFunctionCall.cpp
+++ b/WebCore/bindings/v8/ScriptFunctionCall.cpp
@@ -74,6 +74,12 @@ void ScriptFunctionCall::appendArgument(const String& argument)
     m_arguments.append(v8String(argument));
 }
 
+void ScriptFunctionCall::appendArgument(const char* argument)
+{
+    ScriptScope scope(m_scriptState);
+    m_arguments.append(v8String(argument));
+}
+
 void ScriptFunctionCall::appendArgument(long argument)
 {
     ScriptScope scope(m_scriptState);
diff --git a/WebCore/bindings/v8/ScriptFunctionCall.h b/WebCore/bindings/v8/ScriptFunctionCall.h
index c46dbe8..6203402 100644
--- a/WebCore/bindings/v8/ScriptFunctionCall.h
+++ b/WebCore/bindings/v8/ScriptFunctionCall.h
@@ -50,6 +50,7 @@ namespace WebCore {
         void appendArgument(const ScriptString&);
         void appendArgument(const ScriptValue&);
         void appendArgument(const String&);
+        void appendArgument(const char*);
         void appendArgument(long);
         void appendArgument(long long);
         void appendArgument(unsigned int);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list