From b849e7fb701fef0cfe52864c887bba31eb318bee Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 5 May 2015 19:12:10 -0400
Subject: [PATCH] Return CefTime instead of time_t from
 CefZipReader::GetFileLastModified (issue #1625)

---
 include/capi/cef_zip_reader_capi.h     | 3 ++-
 include/cef_zip_reader.h               | 2 +-
 libcef/browser/zip_reader_impl.cc      | 8 +++++---
 libcef/browser/zip_reader_impl.h       | 2 +-
 libcef_dll/cpptoc/zip_reader_cpptoc.cc | 6 +++---
 libcef_dll/ctocpp/zip_reader_ctocpp.cc | 6 +++---
 libcef_dll/ctocpp/zip_reader_ctocpp.h  | 2 +-
 tools/cef_parser.py                    | 1 -
 8 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/include/capi/cef_zip_reader_capi.h b/include/capi/cef_zip_reader_capi.h
index eceb32db9..80bf613a7 100644
--- a/include/capi/cef_zip_reader_capi.h
+++ b/include/capi/cef_zip_reader_capi.h
@@ -101,7 +101,8 @@ typedef struct _cef_zip_reader_t {
   ///
   // Returns the last modified timestamp for the file.
   ///
-  time_t (CEF_CALLBACK *get_file_last_modified)(struct _cef_zip_reader_t* self);
+  cef_time_t (CEF_CALLBACK *get_file_last_modified)(
+      struct _cef_zip_reader_t* self);
 
   ///
   // Opens the file for reading of uncompressed data. A read password may
diff --git a/include/cef_zip_reader.h b/include/cef_zip_reader.h
index 1fe02b916..5d8788e94 100644
--- a/include/cef_zip_reader.h
+++ b/include/cef_zip_reader.h
@@ -103,7 +103,7 @@ class CefZipReader : public virtual CefBase {
   // Returns the last modified timestamp for the file.
   ///
   /*--cef()--*/
-  virtual time_t GetFileLastModified() =0;
+  virtual CefTime GetFileLastModified() =0;
 
   ///
   // Opens the file for reading of uncompressed data. A read password may
diff --git a/libcef/browser/zip_reader_impl.cc b/libcef/browser/zip_reader_impl.cc
index dca92ae36..893df1c60 100644
--- a/libcef/browser/zip_reader_impl.cc
+++ b/libcef/browser/zip_reader_impl.cc
@@ -180,11 +180,13 @@ int64 CefZipReaderImpl::GetFileSize() {
   return filesize_;
 }
 
-time_t CefZipReaderImpl::GetFileLastModified() {
+CefTime CefZipReaderImpl::GetFileLastModified() {
+  CefTime time;
   if (!VerifyContext() || !GetFileInfo())
-    return 0;
+    return time;
 
-  return filemodified_;
+  cef_time_from_timet(filemodified_, &time);
+  return time;
 }
 
 bool CefZipReaderImpl::OpenFile(const CefString& password) {
diff --git a/libcef/browser/zip_reader_impl.h b/libcef/browser/zip_reader_impl.h
index d3a9c0968..18d5298c9 100644
--- a/libcef/browser/zip_reader_impl.h
+++ b/libcef/browser/zip_reader_impl.h
@@ -27,7 +27,7 @@ class CefZipReaderImpl : public CefZipReader {
   bool Close() override;
   CefString GetFileName() override;
   int64 GetFileSize() override;
-  time_t GetFileLastModified() override;
+  CefTime GetFileLastModified() override;
   bool OpenFile(const CefString& password) override;
   bool CloseFile() override;
   int ReadFile(void* buffer, size_t bufferSize) override;
diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.cc b/libcef_dll/cpptoc/zip_reader_cpptoc.cc
index e579ce30a..98d1c6808 100644
--- a/libcef_dll/cpptoc/zip_reader_cpptoc.cc
+++ b/libcef_dll/cpptoc/zip_reader_cpptoc.cc
@@ -130,16 +130,16 @@ int64 CEF_CALLBACK zip_reader_get_file_size(struct _cef_zip_reader_t* self) {
   return _retval;
 }
 
-time_t CEF_CALLBACK zip_reader_get_file_last_modified(
+cef_time_t CEF_CALLBACK zip_reader_get_file_last_modified(
     struct _cef_zip_reader_t* self) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
   DCHECK(self);
   if (!self)
-    return 0;
+    return CefTime();
 
   // Execute
-  time_t _retval = CefZipReaderCppToC::Get(self)->GetFileLastModified();
+  cef_time_t _retval = CefZipReaderCppToC::Get(self)->GetFileLastModified();
 
   // Return type: simple
   return _retval;
diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/libcef_dll/ctocpp/zip_reader_ctocpp.cc
index 0941bc7fc..297af3d19 100644
--- a/libcef_dll/ctocpp/zip_reader_ctocpp.cc
+++ b/libcef_dll/ctocpp/zip_reader_ctocpp.cc
@@ -130,15 +130,15 @@ int64 CefZipReaderCToCpp::GetFileSize() {
   return _retval;
 }
 
-time_t CefZipReaderCToCpp::GetFileLastModified() {
+CefTime CefZipReaderCToCpp::GetFileLastModified() {
   cef_zip_reader_t* _struct = GetStruct();
   if (CEF_MEMBER_MISSING(_struct, get_file_last_modified))
-    return 0;
+    return CefTime();
 
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
   // Execute
-  time_t _retval = _struct->get_file_last_modified(_struct);
+  cef_time_t _retval = _struct->get_file_last_modified(_struct);
 
   // Return type: simple
   return _retval;
diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.h b/libcef_dll/ctocpp/zip_reader_ctocpp.h
index f700a292a..cfdff02b1 100644
--- a/libcef_dll/ctocpp/zip_reader_ctocpp.h
+++ b/libcef_dll/ctocpp/zip_reader_ctocpp.h
@@ -36,7 +36,7 @@ class CefZipReaderCToCpp
   bool Close() OVERRIDE;
   CefString GetFileName() OVERRIDE;
   int64 GetFileSize() OVERRIDE;
-  time_t GetFileLastModified() OVERRIDE;
+  CefTime GetFileLastModified() OVERRIDE;
   bool OpenFile(const CefString& password) OVERRIDE;
   bool CloseFile() OVERRIDE;
   int ReadFile(void* buffer, size_t bufferSize) OVERRIDE;
diff --git a/tools/cef_parser.py b/tools/cef_parser.py
index 8895d80c1..c1b2ff47e 100644
--- a/tools/cef_parser.py
+++ b/tools/cef_parser.py
@@ -392,7 +392,6 @@ _simpletypes = {
     'unsigned long' : ['unsigned long', '0'],
     'long long' : ['long long', '0'],
     'size_t' : ['size_t', '0'],
-    'time_t' : ['time_t', '0'],
     'bool' : ['int', '0'],
     'char': ['char', '0'],
     'char* const': ['char* const', 'NULL'],