Update to CEF version 116.0.19+gc6a20bc+chromium-116.0.5845.141

S1artie · magreenblatt · commit 37f25dc37035 · 2023-09-05T15:46:18.000Z
Adapts to the following CEF changes:
-  Remove CEF-specific integer and char16 typedef's #3507
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -130,7 +130,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 
 # Specify the CEF distribution version.
 if(NOT DEFINED CEF_VERSION)
-  set(CEF_VERSION "114.2.9+g1a97a28+chromium-114.0.5735.91")
+  set(CEF_VERSION "116.0.19+gc6a20bc+chromium-116.0.5845.141")
 endif()
 
 # Determine the platform.
diff --git a/native/CefBrowser_N.cpp b/native/CefBrowser_N.cpp
@@ -1053,12 +1053,12 @@ void OnAfterParentChanged(CefRefPtr<CefBrowser> browser) {
   }
 }
 
-jobject NewJNILongVector(JNIEnv* env, const std::vector<int64>& vals) {
+jobject NewJNILongVector(JNIEnv* env, const std::vector<int64_t>& vals) {
   ScopedJNIObjectLocal jvector(env, "java/util/Vector");
   if (!jvector)
     return nullptr;
 
-  std::vector<int64>::const_iterator iter;
+  std::vector<int64_t>::const_iterator iter;
   for (iter = vals.begin(); iter != vals.end(); ++iter) {
     ScopedJNIObjectLocal argument(
         env, NewJNIObject(env, "java/lang/Long", "(J)V", (jlong)*iter));
@@ -1311,7 +1311,7 @@ JNIEXPORT jobject JNICALL
 Java_org_cef_browser_CefBrowser_1N_N_1GetFrameIdentifiers(JNIEnv* env,
                                                           jobject obj) {
   CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
-  std::vector<int64> identifiers;
+  std::vector<int64_t> identifiers;
   browser->GetFrameIdentifiers(identifiers);
   return NewJNILongVector(env, identifiers);
 }
@@ -1609,7 +1609,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1SendKeyEvent(JNIEnv* env,
   JNI_STATIC_DEFINE_INT(env, cls, KEY_TYPED);
 
   int event_type, modifiers;
-  char16 key_char;
+  char16_t key_char;
   if (!CallJNIMethodI_V(env, cls, key_event, "getID", &event_type) ||
       !CallJNIMethodC_V(env, cls, key_event, "getKeyChar", &key_char) ||
       !CallJNIMethodI_V(env, cls, key_event, "getModifiersEx", &modifiers)) {
diff --git a/native/browser_process_handler.cpp b/native/browser_process_handler.cpp
@@ -38,7 +38,7 @@ void BrowserProcessHandler::OnContextInitialized() {
   JNI_CALL_VOID_METHOD(env, handle_, "onContextInitialized", "()V");
 }
 
-void BrowserProcessHandler::OnScheduleMessagePumpWork(int64 delay_ms) {
+void BrowserProcessHandler::OnScheduleMessagePumpWork(int64_t delay_ms) {
   if (!handle_)
     return;
 
diff --git a/native/browser_process_handler.h b/native/browser_process_handler.h
@@ -33,7 +33,7 @@ class BrowserProcessHandler : public CefBrowserProcessHandler {
   virtual ~BrowserProcessHandler();
 
   void OnContextInitialized() override;
-  void OnScheduleMessagePumpWork(int64 delay_ms) override;
+  void OnScheduleMessagePumpWork(int64_t delay_ms) override;
 
   static CefRefPtr<CefListValue> GetMessageRouterConfigs();
   static void AddMessageRouterConfig(const CefMessageRouterConfig& cfg);
diff --git a/native/jni_util.cpp b/native/jni_util.cpp
@@ -948,7 +948,7 @@ bool CallJNIMethodC_V(JNIEnv* env,
                       jclass cls,
                       jobject obj,
                       const char* method_name,
-                      char16* value) {
+                      char16_t* value) {
   jmethodID methodID = env->GetMethodID(cls, method_name, "()C");
   if (methodID) {
     *value = env->CallCharMethod(obj, methodID);
diff --git a/native/jni_util.h b/native/jni_util.h
@@ -173,7 +173,7 @@ bool CallJNIMethodC_V(JNIEnv* env,
                       jclass cls,
                       jobject obj,
                       const char* method_name,
-                      char16* value);
+                      char16_t* value);
 
 // Rertieve the CefSize equivalent of a java.awt.Dimension.
 CefSize GetJNISize(JNIEnv* env, jobject obj);
diff --git a/native/message_router_handler.cpp b/native/message_router_handler.cpp
@@ -28,7 +28,7 @@ MessageRouterHandler::MessageRouterHandler(JNIEnv* env, jobject handler)
 bool MessageRouterHandler::OnQuery(
     CefRefPtr<CefBrowser> browser,
     CefRefPtr<CefFrame> frame,
-    int64 query_id,
+    int64_t query_id,
     const CefString& request,
     bool persistent,
     CefRefPtr<CefMessageRouterBrowserSide::Callback> callback) {
@@ -63,7 +63,7 @@ bool MessageRouterHandler::OnQuery(
 
 void MessageRouterHandler::OnQueryCanceled(CefRefPtr<CefBrowser> browser,
                                            CefRefPtr<CefFrame> frame,
-                                           int64 query_id) {
+                                           int64_t query_id) {
   ScopedJNIEnv env;
   if (!env)
     return;
diff --git a/native/message_router_handler.h b/native/message_router_handler.h
@@ -21,13 +21,13 @@ class MessageRouterHandler : public CefMessageRouterBrowserSide::Handler,
   // CefMessageRouterHandler methods
   virtual bool OnQuery(CefRefPtr<CefBrowser> browser,
                        CefRefPtr<CefFrame> frame,
-                       int64 query_id,
+                       int64_t query_id,
                        const CefString& request,
                        bool persistent,
                        CefRefPtr<Callback> callback) override;
   virtual void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
                                CefRefPtr<CefFrame> frame,
-                               int64 query_id) override;
+                               int64_t query_id) override;
 
  protected:
   ScopedJNIObjectGlobal handle_;
diff --git a/native/resource_handler.cpp b/native/resource_handler.cpp
@@ -36,7 +36,7 @@ bool ResourceHandler::ProcessRequest(CefRefPtr<CefRequest> request,
 }
 
 void ResourceHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,
-                                         int64& response_length,
+                                         int64_t& response_length,
                                          CefString& redirectUrl) {
   ScopedJNIEnv env;
   if (!env)
diff --git a/native/resource_handler.h b/native/resource_handler.h
@@ -21,7 +21,7 @@ class ResourceHandler : public CefResourceHandler {
   bool ProcessRequest(CefRefPtr<CefRequest> request,
                       CefRefPtr<CefCallback> callback) override;
   void GetResponseHeaders(CefRefPtr<CefResponse> response,
-                          int64& response_length,
+                          int64_t& response_length,
                           CefString& redirectUrl) override;
   bool ReadResponse(void* data_out,
                     int bytes_to_read,
diff --git a/native/resource_request_handler.cpp b/native/resource_request_handler.cpp
@@ -154,7 +154,7 @@ void ResourceRequestHandler::OnResourceLoadComplete(
     CefRefPtr<CefRequest> request,
     CefRefPtr<CefResponse> response,
     CefResourceRequestHandler::URLRequestStatus status,
-    int64 received_content_length) {
+    int64_t received_content_length) {
   ScopedJNIEnv env;
   if (!env)
     return;
diff --git a/native/resource_request_handler.h b/native/resource_request_handler.h
@@ -43,7 +43,7 @@ class ResourceRequestHandler : public CefResourceRequestHandler {
                               CefRefPtr<CefRequest> request,
                               CefRefPtr<CefResponse> response,
                               URLRequestStatus status,
-                              int64 received_content_length) override;
+                              int64_t received_content_length) override;
   void OnProtocolExecution(CefRefPtr<CefBrowser> browser,
                            CefRefPtr<CefFrame> frame,
                            CefRefPtr<CefRequest> request,
diff --git a/native/url_request_client.cpp b/native/url_request_client.cpp
@@ -52,8 +52,8 @@ void URLRequestClient::OnRequestComplete(CefRefPtr<CefURLRequest> request) {
 }
 
 void URLRequestClient::OnUploadProgress(CefRefPtr<CefURLRequest> request,
-                                        int64 current,
-                                        int64 total) {
+                                        int64_t current,
+                                        int64_t total) {
   ScopedJNIEnv env;
   if (!env)
     return;
@@ -64,8 +64,8 @@ void URLRequestClient::OnUploadProgress(CefRefPtr<CefURLRequest> request,
 }
 
 void URLRequestClient::OnDownloadProgress(CefRefPtr<CefURLRequest> request,
-                                          int64 current,
-                                          int64 total) {
+                                          int64_t current,
+                                          int64_t total) {
   ScopedJNIEnv env;
   if (!env)
     return;
diff --git a/native/url_request_client.h b/native/url_request_client.h
@@ -29,12 +29,12 @@ class URLRequestClient : public CefURLRequestClient {
   virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) override;
 
   virtual void OnUploadProgress(CefRefPtr<CefURLRequest> request,
-                                int64 current,
-                                int64 total) override;
+                                int64_t current,
+                                int64_t total) override;
 
   virtual void OnDownloadProgress(CefRefPtr<CefURLRequest> request,
-                                  int64 current,
-                                  int64 total) override;
+                                  int64_t current,
+                                  int64_t total) override;
 
   virtual void OnDownloadData(CefRefPtr<CefURLRequest> request,
                               const void* data,
diff --git a/native/write_handler.cpp b/native/write_handler.cpp
@@ -42,12 +42,12 @@ size_t WriteHandler::Write(const void* ptr, size_t size, size_t n) {
   return rv;
 }
 
-int WriteHandler::Seek(int64 offset, int whence) {
+int WriteHandler::Seek(int64_t offset, int whence) {
   // not supported by Javas OutputStream
   return -1;
 }
 
-int64 WriteHandler::Tell() {
+int64_t WriteHandler::Tell() {
   return offset_;
 }
 
diff --git a/native/write_handler.h b/native/write_handler.h
@@ -21,8 +21,8 @@ class WriteHandler : public CefWriteHandler {
 
   // CefWriteHandler methods
   virtual size_t Write(const void* ptr, size_t size, size_t n) override;
-  virtual int Seek(int64 offset, int whence) override;
-  virtual int64 Tell() override;
+  virtual int Seek(int64_t offset, int whence) override;
+  virtual int64_t Tell() override;
   virtual int Flush() override;
   virtual bool MayBlock() override;
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ void BrowserProcessHandler::OnContextInitialized() {`
`38`	`38`	`JNI_CALL_VOID_METHOD(env, handle_, "onContextInitialized", "()V");`
`39`	`39`	`}`
`40`	`40`
`41`		`-void BrowserProcessHandler::OnScheduleMessagePumpWork(int64 delay_ms) {`
	`41`	`+void BrowserProcessHandler::OnScheduleMessagePumpWork(int64_t delay_ms) {`
`42`	`42`	`if (!handle_)`
`43`	`43`	`return;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ bool ResourceHandler::ProcessRequest(CefRefPtr<CefRequest> request,`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`void ResourceHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,`
`39`		`- int64& response_length,`
	`39`	`+ int64_t& response_length,`
`40`	`40`	`CefString& redirectUrl) {`
`41`	`41`	`ScopedJNIEnv env;`
`42`	`42`	`if (!env)`