Changeset 58429 in webkit for trunk/JavaScriptCore/wtf/CurrentTime.cpp

Timestamp:

Apr 28, 2010, 2:02:13 PM (15 years ago)

Author:

Darin Adler

Message:

Don't use CFAbsoluteTimeGetCurrent on Mac OS X, since it's just a cover
for gettimeofday anyway.

Reviewed by Sam Weinig.

• wtf/CurrentTime.cpp:

(WTF::currentTime): Remove the CF version of this. Change the "other POSIX"
version to pass 0 for the time zone instead of ignoring a return value.
Also get rid of unneeded type casts, since operations involving both
integers and doubles are always evaluated as doubles in C without explicit
type casting.

File:

• trunk/JavaScriptCore/wtf/CurrentTime.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/CurrentTime.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Google Inc. All rights reserved.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
@@ -54 +54 @@
 #endif
 
-#elif PLATFORM(CF)
-#include <CoreFoundation/CFDate.h>
 #elif PLATFORM(GTK)
 #include <glib.h>
@@ -62 +60 @@
 #elif PLATFORM(BREWMP)
 #include <AEEStdLib.h>
-#else // Posix systems relying on the gettimeofday()
+#else
 #include <sys/time.h>
 #endif
@@ -252 +250 @@
 #endif // USE(QUERY_PERFORMANCE_COUNTER)
 
-#elif PLATFORM(CF)
-
-double currentTime()
-{
-    return CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970;
-}
-
 #elif PLATFORM(GTK)
 
@@ -294 +285 @@
 }
 
-#else // Other Posix systems rely on the gettimeofday().
+#else
 
 double currentTime()
 {
     struct timeval now;
-    struct timezone zone;
-
-    gettimeofday(&now, &zone);
-    return static_cast<double>(now.tv_sec) + (double)(now.tv_usec / 1000000.0);
+    gettimeofday(&now, 0);
+    return now.tv_sec + now.tv_usec / 1000000.0;
 }