Replace CefRequestCallback with CefCallback (fixes issue #1861)

CefRequestCallback::Continue(false) was the same as Cancel(), so we can just use CefCallback instead.
2025-06-05 21:39:12 +02:00 · 2021-09-27 12:09:45 +03:00
parent 23be17f693
commit cbc5710801
33 changed files with 185 additions and 546 deletions
--- a/libcef_dll/ctocpp/request_callback_ctocpp.cc
+++ b/libcef_dll/ctocpp/request_callback_ctocpp.cc
@@ -1,70 +0,0 @@
-// Copyright (c) 2021 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool. If making changes by
-// hand only do so within the body of existing method and function
-// implementations. See the translator.README.txt file in the tools directory
-// for more information.
-//
-// $hash=9fb040d47f4b6627904cc50518d0293bfe11d25d$
-//
-
-#include "libcef_dll/ctocpp/request_callback_ctocpp.h"
-#include "libcef_dll/shutdown_checker.h"
-
-// VIRTUAL METHODS - Body may be edited by hand.
-
-NO_SANITIZE("cfi-icall") void CefRequestCallbackCToCpp::Continue(bool allow) {
-  shutdown_checker::AssertNotShutdown();
-
-  cef_request_callback_t* _struct = GetStruct();
-  if (CEF_MEMBER_MISSING(_struct, cont))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  _struct->cont(_struct, allow);
-}
-
-NO_SANITIZE("cfi-icall") void CefRequestCallbackCToCpp::Cancel() {
-  shutdown_checker::AssertNotShutdown();
-
-  cef_request_callback_t* _struct = GetStruct();
-  if (CEF_MEMBER_MISSING(_struct, cancel))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  _struct->cancel(_struct);
-}
-
-// CONSTRUCTOR - Do not edit by hand.
-
-CefRequestCallbackCToCpp::CefRequestCallbackCToCpp() {}
-
-// DESTRUCTOR - Do not edit by hand.
-
-CefRequestCallbackCToCpp::~CefRequestCallbackCToCpp() {
-  shutdown_checker::AssertNotShutdown();
-}
-
-template <>
-cef_request_callback_t* CefCToCppRefCounted<
-    CefRequestCallbackCToCpp,
-    CefRequestCallback,
-    cef_request_callback_t>::UnwrapDerived(CefWrapperType type,
-                                           CefRequestCallback* c) {
-  NOTREACHED() << "Unexpected class type: " << type;
-  return nullptr;
-}
-
-template <>
-CefWrapperType CefCToCppRefCounted<CefRequestCallbackCToCpp,
-                                   CefRequestCallback,
-                                   cef_request_callback_t>::kWrapperType =
-    WT_REQUEST_CALLBACK;
--- a/libcef_dll/ctocpp/request_callback_ctocpp.h
+++ b/libcef_dll/ctocpp/request_callback_ctocpp.h
@@ -1,42 +0,0 @@
-// Copyright (c) 2021 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool. If making changes by
-// hand only do so within the body of existing method and function
-// implementations. See the translator.README.txt file in the tools directory
-// for more information.
-//
-// $hash=49871b71a226d36c9c60ac06c2a242c106766d34$
-//
-
-#ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_
-#define CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_
-#pragma once
-
-#if !defined(WRAPPING_CEF_SHARED)
-#error This file can be included wrapper-side only
-#endif
-
-#include "include/capi/cef_request_callback_capi.h"
-#include "include/cef_request_callback.h"
-#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
-
-// Wrap a C structure with a C++ class.
-// This class may be instantiated and accessed wrapper-side only.
-class CefRequestCallbackCToCpp
-    : public CefCToCppRefCounted<CefRequestCallbackCToCpp,
-                                 CefRequestCallback,
-                                 cef_request_callback_t> {
- public:
-  CefRequestCallbackCToCpp();
-  virtual ~CefRequestCallbackCToCpp();
-
-  // CefRequestCallback methods.
-  void Continue(bool allow) override;
-  void Cancel() override;
-};
-
-#endif  // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_
--- a/libcef_dll/ctocpp/request_handler_ctocpp.cc
+++ b/libcef_dll/ctocpp/request_handler_ctocpp.cc
@@ -9,14 +9,14 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=cac9a84a4ddb5aa01e9c6fc97f5c4bcb4f4c368f$
+// $hash=73d4abe535f9bec5507447e8d8139ed0fa4b2875$
 //

 #include "libcef_dll/ctocpp/request_handler_ctocpp.h"
 #include "libcef_dll/cpptoc/auth_callback_cpptoc.h"
 #include "libcef_dll/cpptoc/browser_cpptoc.h"
+#include "libcef_dll/cpptoc/callback_cpptoc.h"
 #include "libcef_dll/cpptoc/frame_cpptoc.h"
-#include "libcef_dll/cpptoc/request_callback_cpptoc.h"
 #include "libcef_dll/cpptoc/request_cpptoc.h"
 #include "libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h"
 #include "libcef_dll/cpptoc/sslinfo_cpptoc.h"
@@ -100,14 +100,15 @@ bool CefRequestHandlerCToCpp::OnOpenURLFromTab(
 }

 NO_SANITIZE("cfi-icall")
-CefRefPtr<CefResourceRequestHandler> CefRequestHandlerCToCpp::
-    GetResourceRequestHandler(CefRefPtr<CefBrowser> browser,
-                              CefRefPtr<CefFrame> frame,
-                              CefRefPtr<CefRequest> request,
-                              bool is_navigation,
-                              bool is_download,
-                              const CefString& request_initiator,
-                              bool& disable_default_handling) {
+CefRefPtr<CefResourceRequestHandler>
+CefRequestHandlerCToCpp::GetResourceRequestHandler(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefFrame> frame,
+    CefRefPtr<CefRequest> request,
+    bool is_navigation,
+    bool is_download,
+    const CefString& request_initiator,
+    bool& disable_default_handling) {
  shutdown_checker::AssertNotShutdown();

  cef_request_handler_t* _struct = GetStruct();
@@ -194,11 +195,10 @@ bool CefRequestHandlerCToCpp::GetAuthCredentials(
 }

 NO_SANITIZE("cfi-icall")
-bool CefRequestHandlerCToCpp::OnQuotaRequest(
-    CefRefPtr<CefBrowser> browser,
-    const CefString& origin_url,
-    int64 new_size,
-    CefRefPtr<CefRequestCallback> callback) {
+bool CefRequestHandlerCToCpp::OnQuotaRequest(CefRefPtr<CefBrowser> browser,
+                                             const CefString& origin_url,
+                                             int64 new_size,
+                                             CefRefPtr<CefCallback> callback) {
  shutdown_checker::AssertNotShutdown();

  cef_request_handler_t* _struct = GetStruct();
@@ -223,7 +223,7 @@ bool CefRequestHandlerCToCpp::OnQuotaRequest(
  // Execute
  int _retval = _struct->on_quota_request(
      _struct, CefBrowserCppToC::Wrap(browser), origin_url.GetStruct(),
-      new_size, CefRequestCallbackCppToC::Wrap(callback));
+      new_size, CefCallbackCppToC::Wrap(callback));

  // Return type: bool
  return _retval ? true : false;
@@ -235,7 +235,7 @@ bool CefRequestHandlerCToCpp::OnCertificateError(
    cef_errorcode_t cert_error,
    const CefString& request_url,
    CefRefPtr<CefSSLInfo> ssl_info,
-    CefRefPtr<CefRequestCallback> callback) {
+    CefRefPtr<CefCallback> callback) {
  shutdown_checker::AssertNotShutdown();

  cef_request_handler_t* _struct = GetStruct();
@@ -265,7 +265,7 @@ bool CefRequestHandlerCToCpp::OnCertificateError(
  int _retval = _struct->on_certificate_error(
      _struct, CefBrowserCppToC::Wrap(browser), cert_error,
      request_url.GetStruct(), CefSSLInfoCppToC::Wrap(ssl_info),
-      CefRequestCallbackCppToC::Wrap(callback));
+      CefCallbackCppToC::Wrap(callback));

  // Return type: bool
  return _retval ? true : false;
--- a/libcef_dll/ctocpp/request_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/request_handler_ctocpp.h
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=771c124f112f02314f57b5f9bd475afe6cef3242$
+// $hash=cc1503e0678dd6c15b282a3432830262f9a0d93e$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_HANDLER_CTOCPP_H_
@@ -64,12 +64,12 @@ class CefRequestHandlerCToCpp
  bool OnQuotaRequest(CefRefPtr<CefBrowser> browser,
                      const CefString& origin_url,
                      int64 new_size,
-                      CefRefPtr<CefRequestCallback> callback) override;
+                      CefRefPtr<CefCallback> callback) override;
  bool OnCertificateError(CefRefPtr<CefBrowser> browser,
                          cef_errorcode_t cert_error,
                          const CefString& request_url,
                          CefRefPtr<CefSSLInfo> ssl_info,
-                          CefRefPtr<CefRequestCallback> callback) override;
+                          CefRefPtr<CefCallback> callback) override;
  bool OnSelectClientCertificate(
      CefRefPtr<CefBrowser> browser,
      bool isProxy,
--- a/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc
+++ b/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc
@@ -9,13 +9,13 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=a53f4f53f8063044f5c82870f2cef1ef89a91d83$
+// $hash=f2ef36943d3cb292573201d2b15b4406d9aaeab4$
 //

 #include "libcef_dll/ctocpp/resource_request_handler_ctocpp.h"
 #include "libcef_dll/cpptoc/browser_cpptoc.h"
+#include "libcef_dll/cpptoc/callback_cpptoc.h"
 #include "libcef_dll/cpptoc/frame_cpptoc.h"
-#include "libcef_dll/cpptoc/request_callback_cpptoc.h"
 #include "libcef_dll/cpptoc/request_cpptoc.h"
 #include "libcef_dll/cpptoc/response_cpptoc.h"
 #include "libcef_dll/ctocpp/cookie_access_filter_ctocpp.h"
@@ -25,10 +25,11 @@
 // VIRTUAL METHODS - Body may be edited by hand.

 NO_SANITIZE("cfi-icall")
-CefRefPtr<CefCookieAccessFilter> CefResourceRequestHandlerCToCpp::
-    GetCookieAccessFilter(CefRefPtr<CefBrowser> browser,
-                          CefRefPtr<CefFrame> frame,
-                          CefRefPtr<CefRequest> request) {
+CefRefPtr<CefCookieAccessFilter>
+CefResourceRequestHandlerCToCpp::GetCookieAccessFilter(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefFrame> frame,
+    CefRefPtr<CefRequest> request) {
  cef_resource_request_handler_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_cookie_access_filter))
    return nullptr;
@@ -52,11 +53,11 @@ CefRefPtr<CefCookieAccessFilter> CefResourceRequestHandlerCToCpp::

 NO_SANITIZE("cfi-icall")
 CefResourceRequestHandler::ReturnValue
-    CefResourceRequestHandlerCToCpp::OnBeforeResourceLoad(
-        CefRefPtr<CefBrowser> browser,
-        CefRefPtr<CefFrame> frame,
-        CefRefPtr<CefRequest> request,
-        CefRefPtr<CefRequestCallback> callback) {
+CefResourceRequestHandlerCToCpp::OnBeforeResourceLoad(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefFrame> frame,
+    CefRefPtr<CefRequest> request,
+    CefRefPtr<CefCallback> callback) {
  cef_resource_request_handler_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, on_before_resource_load))
    return RV_CONTINUE;
@@ -76,18 +77,18 @@ CefResourceRequestHandler::ReturnValue
  // Execute
  cef_return_value_t _retval = _struct->on_before_resource_load(
      _struct, CefBrowserCppToC::Wrap(browser), CefFrameCppToC::Wrap(frame),
-      CefRequestCppToC::Wrap(request),
-      CefRequestCallbackCppToC::Wrap(callback));
+      CefRequestCppToC::Wrap(request), CefCallbackCppToC::Wrap(callback));

  // Return type: simple
  return _retval;
 }

 NO_SANITIZE("cfi-icall")
-CefRefPtr<CefResourceHandler> CefResourceRequestHandlerCToCpp::
-    GetResourceHandler(CefRefPtr<CefBrowser> browser,
-                       CefRefPtr<CefFrame> frame,
-                       CefRefPtr<CefRequest> request) {
+CefRefPtr<CefResourceHandler>
+CefResourceRequestHandlerCToCpp::GetResourceHandler(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefFrame> frame,
+    CefRefPtr<CefRequest> request) {
  cef_resource_request_handler_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_resource_handler))
    return nullptr;
@@ -171,11 +172,12 @@ bool CefResourceRequestHandlerCToCpp::OnResourceResponse(
 }

 NO_SANITIZE("cfi-icall")
-CefRefPtr<CefResponseFilter> CefResourceRequestHandlerCToCpp::
-    GetResourceResponseFilter(CefRefPtr<CefBrowser> browser,
-                              CefRefPtr<CefFrame> frame,
-                              CefRefPtr<CefRequest> request,
-                              CefRefPtr<CefResponse> response) {
+CefRefPtr<CefResponseFilter>
+CefResourceRequestHandlerCToCpp::GetResourceResponseFilter(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefFrame> frame,
+    CefRefPtr<CefRequest> request,
+    CefRefPtr<CefResponse> response) {
  cef_resource_request_handler_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_resource_response_filter))
    return nullptr;
--- a/libcef_dll/ctocpp/resource_request_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/resource_request_handler_ctocpp.h
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=0168c1a4e9321014b8a0a9434ea85f89de100cc7$
+// $hash=a3d6561daffb943b551a27f1aa7fe9a58848df98$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_REQUEST_HANDLER_CTOCPP_H_
@@ -39,11 +39,10 @@ class CefResourceRequestHandlerCToCpp
      CefRefPtr<CefBrowser> browser,
      CefRefPtr<CefFrame> frame,
      CefRefPtr<CefRequest> request) override;
-  ReturnValue OnBeforeResourceLoad(
-      CefRefPtr<CefBrowser> browser,
-      CefRefPtr<CefFrame> frame,
-      CefRefPtr<CefRequest> request,
-      CefRefPtr<CefRequestCallback> callback) override;
+  ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
+                                   CefRefPtr<CefFrame> frame,
+                                   CefRefPtr<CefRequest> request,
+                                   CefRefPtr<CefCallback> callback) override;
  CefRefPtr<CefResourceHandler> GetResourceHandler(
      CefRefPtr<CefBrowser> browser,
      CefRefPtr<CefFrame> frame,