1 files changed, 39 insertions, 73 deletions

diff --git a/core/fxcrt/cfx_datetime.cpp b/core/fxcrt/cfx_datetime.cpp
index 56c660917..50f1c6a35 100644
--- a/core/fxcrt/cfx_datetime.cpp
+++ b/core/fxcrt/cfx_datetime.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
+// Copyright 2014 The PDFium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,51 +7,47 @@
 #include "core/fxcrt/cfx_datetime.h"
 
 #include "build/build_config.h"
+#include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_system.h"
-
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-    defined(OS_ASMJS) || defined(__wasm__)
-#include <sys/time.h>
-#include <time.h>
-#endif
+#include "third_party/base/check.h"
+#include "third_party/base/span.h"
 
 namespace {
 
-const uint8_t g_FXDaysPerMonth[12] = {31, 28, 31, 30, 31, 30,
-                                      31, 31, 30, 31, 30, 31};
-const uint8_t g_FXDaysPerLeapMonth[12] = {31, 29, 31, 30, 31, 30,
-                                          31, 31, 30, 31, 30, 31};
-const int32_t g_FXDaysBeforeMonth[12] = {0,   31,  59,  90,  120, 151,
-                                         181, 212, 243, 273, 304, 334};
-const int32_t g_FXDaysBeforeLeapMonth[12] = {0,   31,  60,  91,  121, 152,
-                                             182, 213, 244, 274, 305, 335};
-const int32_t g_FXDaysPerYear = 365;
-const int32_t g_FXDaysPerLeapYear = 366;
+constexpr uint8_t kDaysPerMonth[12] = {31, 28, 31, 30, 31, 30,
+                                       31, 31, 30, 31, 30, 31};
+constexpr uint8_t kDaysPerLeapMonth[12] = {31, 29, 31, 30, 31, 30,
+                                           31, 31, 30, 31, 30, 31};
+constexpr int32_t kDaysBeforeMonth[12] = {0,   31,  59,  90,  120, 151,
+                                          181, 212, 243, 273, 304, 334};
+constexpr int32_t kDaysBeforeLeapMonth[12] = {0,   31,  60,  91,  121, 152,
+                                              182, 213, 244, 274, 305, 335};
+constexpr int32_t kDaysPerYear = 365;
+constexpr int32_t kDaysPerLeapYear = 366;
 
 int32_t DaysBeforeMonthInYear(int32_t iYear, uint8_t iMonth) {
-  ASSERT(iYear != 0);
-  ASSERT(iMonth >= 1);
-  ASSERT(iMonth <= 12);
-
-  const int32_t* p =
-      FX_IsLeapYear(iYear) ? g_FXDaysBeforeLeapMonth : g_FXDaysBeforeMonth;
+  DCHECK(iYear != 0);
+  pdfium::span<const int32_t> p = FX_IsLeapYear(iYear)
+                                      ? pdfium::make_span(kDaysBeforeLeapMonth)
+                                      : pdfium::make_span(kDaysBeforeMonth);
+  // Note: iMonth is one-based.
   return p[iMonth - 1];
 }
 
 int32_t DaysInYear(int32_t iYear) {
-  ASSERT(iYear != 0);
-  return FX_IsLeapYear(iYear) ? g_FXDaysPerLeapYear : g_FXDaysPerYear;
+  DCHECK(iYear != 0);
+  return FX_IsLeapYear(iYear) ? kDaysPerLeapYear : kDaysPerYear;
 }
 
 int64_t DateToDays(int32_t iYear,
                    uint8_t iMonth,
                    uint8_t iDay,
                    bool bIncludeThisDay) {
-  ASSERT(iYear != 0);
-  ASSERT(iMonth >= 1);
-  ASSERT(iMonth <= 12);
-  ASSERT(iDay >= 1);
-  ASSERT(iDay <= FX_DaysInMonth(iYear, iMonth));
+  DCHECK(iYear != 0);
+  DCHECK(iMonth >= 1);
+  DCHECK(iMonth <= 12);
+  DCHECK(iDay >= 1);
+  DCHECK(iDay <= FX_DaysInMonth(iYear, iMonth));
 
   int64_t iDays = DaysBeforeMonthInYear(iYear, iMonth);
   iDays += iDay;
@@ -68,61 +64,31 @@ int64_t DateToDays(int32_t iYear,
          iYear / 400;
 }
 
-struct FXUT_SYSTEMTIME {
-  uint16_t wYear;
-  uint16_t wMonth;
-  uint16_t wDayOfWeek;
-  uint16_t wDay;
-  uint16_t wHour;
-  uint16_t wMinute;
-  uint16_t wSecond;
-  uint16_t wMillisecond;
-};
-
 }  // namespace
 
 uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth) {
-  ASSERT(iYear != 0);
-  ASSERT(iMonth >= 1);
-  ASSERT(iMonth <= 12);
-
-  const uint8_t* p =
-      FX_IsLeapYear(iYear) ? g_FXDaysPerLeapMonth : g_FXDaysPerMonth;
+  DCHECK(iYear != 0);
+  pdfium::span<const uint8_t> p = FX_IsLeapYear(iYear)
+                                      ? pdfium::make_span(kDaysPerLeapMonth)
+                                      : pdfium::make_span(kDaysPerMonth);
+  // Note: iMonth is one-based.
   return p[iMonth - 1];
 }
 
 bool FX_IsLeapYear(int32_t iYear) {
-  ASSERT(iYear != 0);
+  DCHECK(iYear != 0);
   return ((iYear % 4) == 0 && (iYear % 100) != 0) || (iYear % 400) == 0;
 }
 
 // static
 CFX_DateTime CFX_DateTime::Now() {
-  FXUT_SYSTEMTIME utLocal;
-#if defined(OS_WIN)
-  ::GetLocalTime((LPSYSTEMTIME)&utLocal);
-#else
-  timeval curTime;
-  gettimeofday(&curTime, nullptr);
-
-  struct tm st;
-  localtime_r(&curTime.tv_sec, &st);
-  utLocal.wYear = st.tm_year + 1900;
-  utLocal.wMonth = st.tm_mon + 1;
-  utLocal.wDayOfWeek = st.tm_wday;
-  utLocal.wDay = st.tm_mday;
-  utLocal.wHour = st.tm_hour;
-  utLocal.wMinute = st.tm_min;
-  utLocal.wSecond = st.tm_sec;
-  utLocal.wMillisecond = curTime.tv_usec / 1000;
-#endif  // defined(OS_WIN)
-
-  return CFX_DateTime(utLocal.wYear, static_cast<uint8_t>(utLocal.wMonth),
-                      static_cast<uint8_t>(utLocal.wDay),
-                      static_cast<uint8_t>(utLocal.wHour),
-                      static_cast<uint8_t>(utLocal.wMinute),
-                      static_cast<uint8_t>(utLocal.wSecond),
-                      static_cast<uint16_t>(utLocal.wMillisecond));
+  time_t t = FXSYS_time(nullptr);
+  struct tm* pTime = FXSYS_localtime(&t);
+  return CFX_DateTime(
+      pTime->tm_year + 1900, static_cast<uint8_t>(pTime->tm_mon + 1),
+      static_cast<uint8_t>(pTime->tm_mday),
+      static_cast<uint8_t>(pTime->tm_hour), static_cast<uint8_t>(pTime->tm_min),
+      static_cast<uint8_t>(pTime->tm_sec), 0);
 }
 
 int32_t CFX_DateTime::GetDayOfWeek() const {