Changeset 12445 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jan 28, 2006, 11:42:32 PM (19 years ago)

Author:

darin

Message:

Reviewed by John Sullivan.

• ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6895 include exception names in JavaScript form of DOM exception

• khtml/ecma/kjs_binding.cpp: (KJS::setDOMException): Include the name of the exception in the error message.

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -717 +717 @@
     struct timeval tv;
     gettimeofday(&tv, 0);
-    double utc = floor(tv.tv_sec * msPerSecond + tv.tv_usec / msPerSecond);
+    double utc = floor(tv.tv_sec * msPerSecond + tv.tv_usec / 1000);
 #else
 #  if __BORLANDC__
@@ -726 +726 @@
     _ftime(&timebuffer);
 #  endif
-    double utc = floor(timebuffer.time * msPerSecond + timebuffer.millitm);
+    double utc = timebuffer.time * msPerSecond + timebuffer.millitm;
 #endif
     value = utc;
   } else if (numArgs == 1) {
-      if (args[0]->isString())
-          value = parseDate(args[0]->toString(exec));
+    if (args[0]->isObject(&DateInstance::info))
+      value = static_cast<JSObject*>(args[0])->internalValue()->toNumber(exec);
+    else {
+      JSValue* primitive = args[0]->toPrimitive(exec);
+      if (primitive->isString())
+        value = parseDate(primitive->getString());
       else
-          value = args[0]->toPrimitive(exec)->toNumber(exec);
+        value = primitive->toNumber(exec);
+    }
   } else {
     if (isNaN(args[0]->toNumber(exec))