Skip to content

Commit 0cdd84c

Browse files
S1artiemagreenblatt
authored andcommitted
Update to CEF version 105.3.36+g88e0038+chromium-105.0.5195.102
1 parent 51cb9c7 commit 0cdd84c

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
130130

131131
# Specify the CEF distribution version.
132132
if(NOT DEFINED CEF_VERSION)
133-
set(CEF_VERSION "104.4.23+g46ae630+chromium-104.0.5112.102")
133+
set(CEF_VERSION "105.3.36+g88e0038+chromium-105.0.5195.102")
134134
endif()
135135

136136
# Determine the platform.

native/CefCookieManager_N.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CefCookie GetJNICookie(JNIEnv* env, jobject jcookie) {
3333
CefString value(&cookie.value);
3434
CefString domain(&cookie.domain);
3535
CefString path(&cookie.path);
36-
CefTime creation, lastAccess, expires;
36+
CefBaseTime creation, lastAccess, expires;
3737

3838
GetJNIFieldString(env, cls, jcookie, "name", &name);
3939
GetJNIFieldString(env, cls, jcookie, "value", &value);

native/jni_scoped_helpers.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ jobject NewJNIStringRef(JNIEnv* env, const CefString& initValue) {
120120
return jstringRef.Release();
121121
}
122122

123-
jobject NewJNIDate(JNIEnv* env, const CefTime& time) {
123+
jobject NewJNIDate(JNIEnv* env, const CefBaseTime& time) {
124124
ScopedJNIObjectLocal jdate(env, "java/util/Date");
125125
if (!jdate)
126126
return nullptr;
127-
double timestamp = time.GetDoubleT() * 1000;
127+
CefTime cef_time;
128+
cef_time_from_basetime(time, &cef_time);
129+
double timestamp = cef_time.GetDoubleT() * 1000;
128130
JNI_CALL_VOID_METHOD(env, jdate, "setTime", "(J)V", (jlong)timestamp);
129131
return jdate.Release();
130132
}
@@ -294,7 +296,7 @@ ScopedJNIString::ScopedJNIString(JNIEnv* env, const std::string& str)
294296
DCHECK(jhandle_);
295297
}
296298

297-
ScopedJNIDate::ScopedJNIDate(JNIEnv* env, const CefTime& time)
299+
ScopedJNIDate::ScopedJNIDate(JNIEnv* env, const CefBaseTime& time)
298300
: ScopedJNIBase<jobject>(env) {
299301
jhandle_ = NewJNIDate(env, time);
300302
DCHECK(jhandle_);

native/jni_scoped_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ class ScopedJNIString : public ScopedJNIBase<jstring> {
684684
// JNI date.
685685
class ScopedJNIDate : public ScopedJNIBase<jobject> {
686686
public:
687-
ScopedJNIDate(JNIEnv* env, const CefTime& time);
687+
ScopedJNIDate(JNIEnv* env, const CefBaseTime& time);
688688
};
689689

690690
// JNI cookie.

native/jni_util.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
#include "jni_scoped_helpers.h"
1111

12+
#include "include/cef_base.h"
13+
1214
namespace {
1315

1416
JavaVM* g_jvm = nullptr;
@@ -804,14 +806,16 @@ bool GetJNIFieldDate(JNIEnv* env,
804806
jclass cls,
805807
jobject obj,
806808
const char* field_name,
807-
CefTime* value) {
809+
CefBaseTime* value) {
808810
jobject fieldobj = nullptr;
809811
if (GetJNIFieldObject(env, cls, obj, field_name, &fieldobj,
810812
"Ljava/util/Date;")) {
811813
ScopedJNIObjectLocal jdate(env, fieldobj);
812814
long timestamp = 0;
813815
JNI_CALL_METHOD(env, jdate, "getTime", "()J", Long, timestamp);
814-
value->SetDoubleT((double)(timestamp / 1000));
816+
CefTime cef_time;
817+
cef_time.SetDoubleT((double)(timestamp / 1000));
818+
cef_time_to_basetime(&cef_time, value);
815819
return true;
816820
}
817821
return false;

native/jni_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ bool GetJNIFieldDate(JNIEnv* env,
110110
jclass cls,
111111
jobject obj,
112112
const char* field_name,
113-
CefTime* value);
113+
CefBaseTime* value);
114114

115115
bool GetJNIFieldBoolean(JNIEnv* env,
116116
jclass cls,

0 commit comments

Comments
 (0)