bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return CefTime instead of time_t from CefZipReader::GetFileLastModified (issue #1625)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-05-05 19:12:10 -04:00
parent 616fdbf3ff
commit b849e7fb70
8 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/capi/cef_zip_reader_capi.h
View File

@ -101,7 +101,8 @@ typedef struct _cef_zip_reader_t {
/// ///
// Returns the last modified timestamp for the file. // 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 // Opens the file for reading of uncompressed data. A read password may

2
include/cef_zip_reader.h
View File

@ -103,7 +103,7 @@ class CefZipReader : public virtual CefBase {
// Returns the last modified timestamp for the file. // Returns the last modified timestamp for the file.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual time_t GetFileLastModified() =0; virtual CefTime GetFileLastModified() =0;
/// ///
// Opens the file for reading of uncompressed data. A read password may // Opens the file for reading of uncompressed data. A read password may

8
libcef/browser/zip_reader_impl.cc
View File

@ -180,11 +180,13 @@ int64 CefZipReaderImpl::GetFileSize() {
return filesize_; return filesize_;
} }
time_t CefZipReaderImpl::GetFileLastModified() { CefTime CefZipReaderImpl::GetFileLastModified() {
CefTime time;
if (!VerifyContext() || !GetFileInfo()) if (!VerifyContext() || !GetFileInfo())
return 0; return time;
return filemodified_; cef_time_from_timet(filemodified_, &time);
return time;
} }
bool CefZipReaderImpl::OpenFile(const CefString& password) { bool CefZipReaderImpl::OpenFile(const CefString& password) {

2
libcef/browser/zip_reader_impl.h
View File

@ -27,7 +27,7 @@ class CefZipReaderImpl : public CefZipReader {
bool Close() override; bool Close() override;
CefString GetFileName() override; CefString GetFileName() override;
int64 GetFileSize() override; int64 GetFileSize() override;
time_t GetFileLastModified() override; CefTime GetFileLastModified() override;
bool OpenFile(const CefString& password) override; bool OpenFile(const CefString& password) override;
bool CloseFile() override; bool CloseFile() override;
int ReadFile(void* buffer, size_t bufferSize) override; int ReadFile(void* buffer, size_t bufferSize) override;

6
libcef_dll/cpptoc/zip_reader_cpptoc.cc
View File

@ -130,16 +130,16 @@ int64 CEF_CALLBACK zip_reader_get_file_size(struct _cef_zip_reader_t* self) {
return _retval; 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) { struct _cef_zip_reader_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self); DCHECK(self);
if (!self) if (!self)
return 0; return CefTime();
// Execute // Execute
time_t _retval = CefZipReaderCppToC::Get(self)->GetFileLastModified(); cef_time_t _retval = CefZipReaderCppToC::Get(self)->GetFileLastModified();
// Return type: simple // Return type: simple
return _retval; return _retval;

6
libcef_dll/ctocpp/zip_reader_ctocpp.cc
View File

@ -130,15 +130,15 @@ int64 CefZipReaderCToCpp::GetFileSize() {
return _retval; return _retval;
} }
time_t CefZipReaderCToCpp::GetFileLastModified() { CefTime CefZipReaderCToCpp::GetFileLastModified() {
cef_zip_reader_t* _struct = GetStruct(); cef_zip_reader_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, get_file_last_modified)) if (CEF_MEMBER_MISSING(_struct, get_file_last_modified))
return 0; return CefTime();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute // Execute
time_t _retval = _struct->get_file_last_modified(_struct); cef_time_t _retval = _struct->get_file_last_modified(_struct);
// Return type: simple // Return type: simple
return _retval; return _retval;

2
libcef_dll/ctocpp/zip_reader_ctocpp.h
View File

@ -36,7 +36,7 @@ class CefZipReaderCToCpp
bool Close() OVERRIDE; bool Close() OVERRIDE;
CefString GetFileName() OVERRIDE; CefString GetFileName() OVERRIDE;
int64 GetFileSize() OVERRIDE; int64 GetFileSize() OVERRIDE;
time_t GetFileLastModified() OVERRIDE; CefTime GetFileLastModified() OVERRIDE;
bool OpenFile(const CefString& password) OVERRIDE; bool OpenFile(const CefString& password) OVERRIDE;
bool CloseFile() OVERRIDE; bool CloseFile() OVERRIDE;
int ReadFile(void* buffer, size_t bufferSize) OVERRIDE; int ReadFile(void* buffer, size_t bufferSize) OVERRIDE;

1
tools/cef_parser.py
View File

@ -392,7 +392,6 @@ _simpletypes = {
'unsigned long' : ['unsigned long', '0'], 'unsigned long' : ['unsigned long', '0'],
'long long' : ['long long', '0'], 'long long' : ['long long', '0'],
'size_t' : ['size_t', '0'], 'size_t' : ['size_t', '0'],
'time_t' : ['time_t', '0'],
'bool' : ['int', '0'], 'bool' : ['int', '0'],
'char': ['char', '0'], 'char': ['char', '0'],
'char* const': ['char* const', 'NULL'], 'char* const': ['char* const', 'NULL'],