[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:19:45 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 137489909335709a8e7bf9bfa4d6f2e0178dbbd7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 15 16:42:41 2003 +0000

            Reviewed by Ken.
    
    	- rolled in a change from the KJS folks
    
    	Fixes a bug where the date functions would not accept non-strings.
    	And provides a bit of a speedup.
    
            * kjs/date_object.h: Change parameter type for parseDate.
            * kjs/date_object.cpp:
            (DateObjectFuncImp::call): Always call toString, don't check the type.
            (KJS::parseDate): Take a UString parameter, not a String parameter.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8c4f25b..754a88e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- rolled in a change from the KJS folks
+
+	Fixes a bug where the date functions would not accept non-strings.
+	And provides a bit of a speedup.
+
+        * kjs/date_object.h: Change parameter type for parseDate.
+        * kjs/date_object.cpp:
+        (DateObjectFuncImp::call): Always call toString, don't check the type.
+        (KJS::parseDate): Take a UString parameter, not a String parameter.
+
 2003-01-13  Darin Adler  <darin at apple.com>
 
         * kjs/ustring.h: Fix spelling of occurrence.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 8c4f25b..754a88e 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- rolled in a change from the KJS folks
+
+	Fixes a bug where the date functions would not accept non-strings.
+	And provides a bit of a speedup.
+
+        * kjs/date_object.h: Change parameter type for parseDate.
+        * kjs/date_object.cpp:
+        (DateObjectFuncImp::call): Always call toString, don't check the type.
+        (KJS::parseDate): Take a UString parameter, not a String parameter.
+
 2003-01-13  Darin Adler  <darin at apple.com>
 
         * kjs/ustring.h: Fix spelling of occurrence.
diff --git a/JavaScriptCore/kjs/date_object.cpp b/JavaScriptCore/kjs/date_object.cpp
index d3c50a9..eefbe2a 100644
--- a/JavaScriptCore/kjs/date_object.cpp
+++ b/JavaScriptCore/kjs/date_object.cpp
@@ -674,10 +674,7 @@ bool DateObjectFuncImp::implementsCall() const
 Value DateObjectFuncImp::call(ExecState *exec, Object &/*thisObj*/, const List &args)
 {
   if (id == Parse) {
-    if (args[0].type() == StringType)
-      return parseDate(args[0].toString(exec));
-    else
-      return Number(NaN);
+    return parseDate(args[0].toString(exec));
   }
   else { // UTC
     struct tm t;
@@ -710,9 +707,8 @@ Value DateObjectFuncImp::call(ExecState *exec, Object &/*thisObj*/, const List &
 // -----------------------------------------------------------------------------
 
 
-Value KJS::parseDate(const String &s)
+Value KJS::parseDate(const UString &u)
 {
-  UString u = s.value();
 #ifdef KJS_VERBOSE
   fprintf(stderr,"KJS::parseDate %s\n",u.ascii());
 #endif
diff --git a/JavaScriptCore/kjs/date_object.h b/JavaScriptCore/kjs/date_object.h
index 51b59aa..c72f3e9 100644
--- a/JavaScriptCore/kjs/date_object.h
+++ b/JavaScriptCore/kjs/date_object.h
@@ -119,7 +119,7 @@ namespace KJS {
   };
 
   // helper functions
-  Value parseDate(const String &s);
+  Value parseDate(const UString &u);
   time_t KRFCDate_parseDate(const UString &_date); 
   Value timeClip(const Value &t);
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list