Don't use NotificationStateLock for GetMainFrame (see issue #2421 )

This causes a race related to |notification_state_lock_| assignment when GetMainFrame is called from multiple threads. GetMainFrame doesn't trigger any notifications so it shouldn't need that lock. Instead, only use NotificationStateLock on the UI thread.
Remove usage of FrameTreeNode IDs (see issue #2421 )
2025-06-05 21:39:12 +02:00 · 2021-09-16 20:06:16 +03:00 · 2021-09-16 20:06:16 +03:00 · 2021-09-15 08:43:20 +00:00 · 2021-09-01 21:30:32 +00:00 · 2021-08-25 21:08:49 +00:00
1034 changed files with 6295 additions and 34026 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -466,8 +466,6 @@ static_library("libcef_static") {
    "libcef/browser/chrome/chrome_context_menu_handler.cc",
    "libcef/browser/chrome/chrome_context_menu_handler.h",
    "libcef/browser/chrome_crash_reporter_client_stub.cc",
-    "libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.cc",
-    "libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.h",
    "libcef/browser/context.cc",
    "libcef/browser/context.h",
    "libcef/browser/context_menu_params_impl.cc",
@@ -524,6 +522,8 @@ static_library("libcef_static") {
    "libcef/browser/extensions/extension_web_contents_observer.h",
    "libcef/browser/extensions/mime_handler_view_guest_delegate.cc",
    "libcef/browser/extensions/mime_handler_view_guest_delegate.h",
+    "libcef/browser/extensions/pdf_extension_util.cc",
+    "libcef/browser/extensions/pdf_extension_util.h",
    "libcef/browser/extensions/pdf_web_contents_helper_client.cc",
    "libcef/browser/extensions/pdf_web_contents_helper_client.h",
    "libcef/browser/extensions/value_store/cef_value_store.cc",
@@ -535,7 +535,6 @@ static_library("libcef_static") {
    "libcef/browser/file_dialog_manager.h",
    "libcef/browser/frame_host_impl.cc",
    "libcef/browser/frame_host_impl.h",
-    "libcef/browser/frame_service_base.h",
    "libcef/browser/image_impl.cc",
    "libcef/browser/image_impl.h",
    "libcef/browser/iothread_state.cc",
@@ -620,6 +619,8 @@ static_library("libcef_static") {
    "libcef/browser/osr/web_contents_view_osr.cc",
    "libcef/browser/osr/web_contents_view_osr.h",
    "libcef/browser/path_util_impl.cc",
+    "libcef/browser/plugins/plugin_service_filter.cc",
+    "libcef/browser/plugins/plugin_service_filter.h",
    "libcef/browser/prefs/browser_prefs.cc",
    "libcef/browser/prefs/browser_prefs.h",
    "libcef/browser/prefs/pref_store.cc",
@@ -704,7 +705,6 @@ static_library("libcef_static") {
    "libcef/common/file_util_impl.cc",
    "libcef/common/frame_util.cc",
    "libcef/common/frame_util.h",
-    "libcef/common/i18n_util_impl.cc",
    "libcef/common/json_impl.cc",
    "libcef/common/main_runner_delegate.h",
    "libcef/common/main_runner_handler.h",
@@ -802,6 +802,9 @@ static_library("libcef_static") {
  configs += [
    "libcef/features:config",
    "//build/config:precompiled_headers",
+
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    "//build/config/compiler:no_size_t_to_int_warning",
  ]

  public_configs = [
@@ -1055,8 +1058,6 @@ static_library("libcef_static") {
      "libcef/browser/chrome/views/chrome_browser_frame.h",
      "libcef/browser/chrome/views/chrome_browser_view.cc",
      "libcef/browser/chrome/views/chrome_browser_view.h",
-      "libcef/browser/chrome/views/chrome_views_util.cc",
-      "libcef/browser/chrome/views/chrome_views_util.h",
      "libcef/browser/chrome/views/toolbar_view_impl.cc",
      "libcef/browser/chrome/views/toolbar_view_impl.h",
      "libcef/browser/chrome/views/toolbar_view_view.cc",
@@ -1098,8 +1099,6 @@ static_library("libcef_static") {
      "libcef/browser/views/menu_button_view.h",
      "libcef/browser/views/menu_runner_views.cc",
      "libcef/browser/views/menu_runner_views.h",
-      "libcef/browser/views/overlay_view_host.cc",
-      "libcef/browser/views/overlay_view_host.h",
      "libcef/browser/views/panel_impl.h",
      "libcef/browser/views/panel_view.h",
      "libcef/browser/views/scroll_view_impl.cc",
@@ -1184,21 +1183,6 @@ static_library("libcef_static") {
          # Part of //ui/events:test_support which is testingonly.
          "//ui/events/test/x11_event_waiter.cc",
          "//ui/events/test/x11_event_waiter.h",
-          # Part of //ui/ozone::ui_test_support which is testingonly.
-          "//ui/ozone/common/test/stub_ozone_ui_controls_test_helper.cc",
-          "//ui/ozone/common/test/stub_ozone_ui_controls_test_helper.h",
-          "//ui/ozone/public/ozone_ui_controls_test_helper.cc",
-          "//ui/ozone/public/ozone_ui_controls_test_helper.h",
-          "$root_gen_dir/ui/ozone/test_constructor_list.cc",
-          # Part of //ui/views:test_support which is testingonly.
-          "//ui/views/test/test_desktop_screen_ozone.cc",
-          "//ui/views/test/test_desktop_screen_ozone.h",
-          "//ui/views/test/ui_controls_factory_desktop_aura_ozone.cc",
-          "//ui/views/test/ui_controls_factory_desktop_aura_ozone.h",
-        ]
-
-        deps += [
-          "//ui/ozone:generate_test_support_constructor_list",
        ]

        if (use_x11) {
@@ -1209,9 +1193,9 @@ static_library("libcef_static") {
            "//ui/base/x/test/x11_ui_controls_test_helper.h",
            # Part of //ui/aura:test_support which is testingonly.
            "//ui/aura/test/x11_event_sender.h",
-            # Part of //ui/ozone/platform/x11:test_support which is testingonly.
-            "//ui/ozone/platform/x11/x11_ozone_ui_controls_test_helper.cc",
-            "//ui/ozone/platform/x11/x11_ozone_ui_controls_test_helper.h",
+            # Part of //ui/views:test_support which is testingonly.
+            "//ui/views/test/ui_controls_factory_desktop_aurax11.cc",
+            "//ui/views/test/ui_controls_factory_desktop_aurax11.h",
          ]
        } else {
          sources += [
@@ -1253,16 +1237,6 @@ static_library("libcef_static") {
 # libcef_dll_wrapper static targets.
 #

-# Configuration that will be applied to all targets that build autogen files.
-config("libcef_autogen_config") {
-  if (is_clang) {
-    cflags = [
-      # Disable clang warnings related to CEF's translation layer templates.
-      "-Wno-undefined-var-template",
-    ]
-  }
-}
-
 # Configuration that will be applied to all targets that depend on
 # libcef_dll_wrapper.
 config("libcef_dll_wrapper_config") {
@@ -1273,8 +1247,6 @@ config("libcef_dll_wrapper_config") {
    # They will be copied to the include/ directory in the binary distribution.
    "$root_out_dir/includes",
  ]
-
-  configs = [ ":libcef_autogen_config" ]
 }

 # libcef_dll_wrapper target.
@@ -1614,10 +1586,6 @@ if (is_mac) {
      ":libcef_static",
    ]

-    configs += [
-      ":libcef_autogen_config",
-    ]
-
    # We don't link the framework so just use the path from the main executable.
    ldflags = [
      "-Wl,-install_name,@executable_path/../Frameworks/$output_name.framework/$output_name",
@@ -1653,10 +1621,6 @@ if (is_mac) {
      ":libcef_static",
    ]

-    configs += [
-      ":libcef_autogen_config",
-    ]
-
    if (is_win) {
      sources += includes_win + [
        "libcef_dll/libcef_dll.rc",
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,6 +7,6 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

 {
-  'chromium_checkout': 'refs/tags/97.0.4692.99',
-  'depot_tools_checkout': 'f7b8f8f3cd'
+  'chromium_checkout': 'refs/tags/93.0.4577.82',
+  'depot_tools_checkout': '45d2afa080'
 }
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -12,7 +12,7 @@
 # distribution include:
 #
 # Linux:      Ninja, GCC 7.5.0+, Unix Makefiles
-# MacOS:      Ninja, Xcode 12.2 to 13.0
+# MacOS:      Ninja, Xcode 12.2 to 12.5
 # Windows:    Ninja, Visual Studio 2019+
 #
 # Ninja is a cross-platform open-source tool for running fast builds using
@@ -36,7 +36,7 @@
 #
 # The below requirements must be met to build this CEF binary distribution.
 #
-# - CMake version 3.19 or newer.
+# - CMake version 2.8.12.1 or newer.
 #
 # - Linux requirements:
 #   Currently supported distributions include Debian 10 (Buster), Ubuntu 18
@@ -48,7 +48,7 @@
 #     libgtk3.0-dev     (required by the cefclient target only)
 #
 # - MacOS requirements:
-#   Xcode 12.2 to 13.0 building on MacOS 10.15.4 (Catalina) or newer. Only
+#   Xcode 12.2 to 12.5 building on MacOS 10.15.4 (Catalina) or newer. Only
 #   64-bit builds are supported. The Xcode command-line tools must also be
 #   installed. Newer Xcode versions may not have been been tested and are not
 #   recommended.
@@ -132,8 +132,7 @@
 # Global setup.
 #

-# For VS2019 and Xcode 12+ support.
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 2.8.12.1)

 # Only generate Debug and Release configuration types.
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
--- a/cef_paths.gypi
+++ b/cef_paths.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights
+# 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.
 #
@@ -8,7 +8,7 @@
 # by hand. See the translator.README.txt file in the tools directory for
 # more information.
 #
-# $hash=872dedb7e5a2f36745446c3d0c9ad8bd5850adb7$
+# $hash=f6950d026a9c92fbb58da3fe0cbcf0050c12ecf0$
 #

 {
@@ -41,7 +41,6 @@
      'include/cef_focus_handler.h',
      'include/cef_frame.h',
      'include/cef_frame_handler.h',
-      'include/cef_i18n_util.h',
      'include/cef_image.h',
      'include/cef_jsdialog_handler.h',
      'include/cef_keyboard_handler.h',
@@ -62,6 +61,7 @@
      'include/cef_render_handler.h',
      'include/cef_render_process_handler.h',
      'include/cef_request.h',
+      'include/cef_request_callback.h',
      'include/cef_request_context.h',
      'include/cef_request_context_handler.h',
      'include/cef_request_handler.h',
@@ -101,7 +101,6 @@
      'include/views/cef_layout.h',
      'include/views/cef_menu_button.h',
      'include/views/cef_menu_button_delegate.h',
-      'include/views/cef_overlay_controller.h',
      'include/views/cef_panel.h',
      'include/views/cef_panel_delegate.h',
      'include/views/cef_scroll_view.h',
@@ -140,7 +139,6 @@
      'include/capi/cef_focus_handler_capi.h',
      'include/capi/cef_frame_capi.h',
      'include/capi/cef_frame_handler_capi.h',
-      'include/capi/cef_i18n_util_capi.h',
      'include/capi/cef_image_capi.h',
      'include/capi/cef_jsdialog_handler_capi.h',
      'include/capi/cef_keyboard_handler_capi.h',
@@ -161,6 +159,7 @@
      'include/capi/cef_render_handler_capi.h',
      'include/capi/cef_render_process_handler_capi.h',
      'include/capi/cef_request_capi.h',
+      'include/capi/cef_request_callback_capi.h',
      'include/capi/cef_request_context_capi.h',
      'include/capi/cef_request_context_handler_capi.h',
      'include/capi/cef_request_handler_capi.h',
@@ -200,7 +199,6 @@
      'include/capi/views/cef_layout_capi.h',
      'include/capi/views/cef_menu_button_capi.h',
      'include/capi/views/cef_menu_button_delegate_capi.h',
-      'include/capi/views/cef_overlay_controller_capi.h',
      'include/capi/views/cef_panel_capi.h',
      'include/capi/views/cef_panel_delegate_capi.h',
      'include/capi/views/cef_scroll_view_capi.h',
@@ -354,8 +352,6 @@
      'libcef_dll/cpptoc/navigation_entry_cpptoc.h',
      'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc',
      'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h',
-      'libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc',
-      'libcef_dll/cpptoc/views/overlay_controller_cpptoc.h',
      'libcef_dll/cpptoc/views/panel_cpptoc.cc',
      'libcef_dll/cpptoc/views/panel_cpptoc.h',
      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc',
@@ -386,6 +382,8 @@
      'libcef_dll/ctocpp/render_process_handler_ctocpp.h',
      'libcef_dll/cpptoc/request_cpptoc.cc',
      'libcef_dll/cpptoc/request_cpptoc.h',
+      'libcef_dll/cpptoc/request_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/request_callback_cpptoc.h',
      'libcef_dll/cpptoc/request_context_cpptoc.cc',
      'libcef_dll/cpptoc/request_context_cpptoc.h',
      'libcef_dll/ctocpp/request_context_handler_ctocpp.cc',
@@ -664,8 +662,6 @@
      'libcef_dll/ctocpp/navigation_entry_ctocpp.h',
      'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc',
      'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h',
-      'libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc',
-      'libcef_dll/ctocpp/views/overlay_controller_ctocpp.h',
      'libcef_dll/ctocpp/views/panel_ctocpp.cc',
      'libcef_dll/ctocpp/views/panel_ctocpp.h',
      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc',
@@ -696,6 +692,8 @@
      'libcef_dll/cpptoc/render_process_handler_cpptoc.h',
      'libcef_dll/ctocpp/request_ctocpp.cc',
      'libcef_dll/ctocpp/request_ctocpp.h',
+      'libcef_dll/ctocpp/request_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/request_callback_ctocpp.h',
      'libcef_dll/ctocpp/request_context_ctocpp.cc',
      'libcef_dll/ctocpp/request_context_ctocpp.h',
      'libcef_dll/cpptoc/request_context_handler_cpptoc.cc',
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -56,7 +56,6 @@
      'include/internal/cef_time.h',
      'include/internal/cef_trace_event_internal.h',
      'include/internal/cef_types.h',
-      'include/internal/cef_types_geometry.h',
    ],
    'includes_capi': [
      'include/capi/cef_base_capi.h',
@@ -266,8 +265,6 @@
      'tests/cefclient/browser/urlrequest_test.h',
      'tests/cefclient/browser/views_menu_bar.cc',
      'tests/cefclient/browser/views_menu_bar.h',
-      'tests/cefclient/browser/views_overlay_controls.cc',
-      'tests/cefclient/browser/views_overlay_controls.h',
      'tests/cefclient/browser/views_style.cc',
      'tests/cefclient/browser/views_style.h',
      'tests/cefclient/browser/views_window.cc',
@@ -480,7 +477,7 @@
      'tests/ceftests/osr_accessibility_unittest.cc',
      'tests/ceftests/osr_display_unittest.cc',
      'tests/ceftests/parser_unittest.cc',
-      'tests/ceftests/pdf_viewer_unittest.cc',
+      'tests/ceftests/plugin_unittest.cc',
      'tests/ceftests/preference_unittest.cc',
      'tests/ceftests/print_unittest.cc',
      'tests/ceftests/process_message_unittest.cc',
@@ -563,7 +560,7 @@
      'tests/ceftests/frame_unittest.cc',
      'tests/ceftests/message_router_unittest.cc',
      'tests/ceftests/navigation_unittest.cc',
-      'tests/ceftests/pdf_viewer_unittest.cc',
+      'tests/ceftests/plugin_unittest.cc',
      'tests/ceftests/preference_unittest.cc',
      'tests/ceftests/process_message_unittest.cc',
      'tests/ceftests/request_handler_unittest.cc',
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -222,11 +222,8 @@ if(OS_LINUX)
    libcef.so
    libEGL.so
    libGLESv2.so
-    libvk_swiftshader.so
-    libvulkan.so.1
    snapshot_blob.bin
    v8_context_snapshot.bin
-    vk_swiftshader_icd.json
    swiftshader
    )

@@ -473,9 +470,6 @@ if(OS_WINDOWS)
    libGLESv2.dll
    snapshot_blob.bin
    v8_context_snapshot.bin
-    vk_swiftshader.dll
-    vk_swiftshader_icd.json
-    vulkan-1.dll
    swiftshader
    )

--- a/include/base/cef_bind.h
+++ b/include/base/cef_bind.h
@@ -54,6 +54,9 @@
 //   auto cb = base::BindOnce(&C::F, instance);
 //   std::move(cb).Run();  // Identical to instance->F()
 //
+// base::Bind is currently a type alias for base::BindRepeating(). In the
+// future, we expect to flip this to default to base::BindOnce().
+//
 // See //docs/callback.md for the full documentation.
 //
 // -----------------------------------------------------------------------------
@@ -123,6 +126,17 @@ BindRepeating(Functor&& functor, Args&&... args) {
                                               std::forward<Args>(args)...);
 }

+// Unannotated Bind.
+// TODO(tzik): Deprecate this and migrate to OnceCallback and
+// RepeatingCallback, once they get ready.
+template <typename Functor, typename... Args>
+inline Callback<internal::MakeUnboundRunType<Functor, Args...>> Bind(
+    Functor&& functor,
+    Args&&... args) {
+  return base::BindRepeating(std::forward<Functor>(functor),
+                             std::forward<Args>(args)...);
+}
+
 // Special cases for binding to a base::Callback without extra bound arguments.
 // We CHECK() the validity of callback to guard against null pointers
 // accidentally ending up in posted tasks, causing hard-to-debug crashes.
@@ -145,6 +159,12 @@ RepeatingCallback<Signature> BindRepeating(
  return callback;
 }

+template <typename Signature>
+Callback<Signature> Bind(Callback<Signature> callback) {
+  CHECK(callback);
+  return callback;
+}
+
 // Unretained() allows binding a non-refcounted class, and to disable
 // refcounting on arguments that are refcounted objects.
 //
--- a/include/base/cef_callback.h
+++ b/include/base/cef_callback.h
@@ -60,6 +60,9 @@
 // will be a no-op. Note that |IsCancelled()| and |is_null()| are distinct:
 // simply cancelling a callback will not also make it null.
 //
+// base::Callback is currently a type alias for base::RepeatingCallback. In the
+// future, we expect to flip this to default to base::OnceCallback.
+//
 // See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/callback.md
 // for the full documentation.

@@ -112,7 +115,7 @@ class OnceCallback<R(Args...)> : public internal::CallbackBase {
    return *this;
  }

-  R Run(Args... args) const& {
+  R Run(Args... args) const & {
    static_assert(!sizeof(*this),
                  "OnceCallback::Run() may only be invoked on a non-const "
                  "rvalue, i.e. std::move(callback).Run().");
@@ -192,7 +195,7 @@ class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
    return !operator==(other);
  }

-  R Run(Args... args) const& {
+  R Run(Args... args) const & {
    PolymorphicInvoke f =
        reinterpret_cast<PolymorphicInvoke>(this->polymorphic_invoke());
    return f(this->bind_state_.get(), std::forward<Args>(args)...);
--- a/include/base/cef_callback_forward.h
+++ b/include/base/cef_callback_forward.h
@@ -48,11 +48,15 @@ class OnceCallback;
 template <typename Signature>
 class RepeatingCallback;

+template <typename Signature>
+using Callback = RepeatingCallback<Signature>;
+
 // Syntactic sugar to make OnceClosure<void()> and RepeatingClosure<void()>
 // easier to declare since they will be used in a lot of APIs with delayed
 // execution.
 using OnceClosure = OnceCallback<void()>;
 using RepeatingClosure = RepeatingCallback<void()>;
+using Closure = Callback<void()>;

 }  // namespace base

--- a/include/base/cef_cancelable_callback.h
+++ b/include/base/cef_cancelable_callback.h
@@ -83,10 +83,10 @@

 #include "include/base/cef_bind.h"
 #include "include/base/cef_callback.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_weak_ptr.h"
 #include "include/base/internal/cef_callback_internal.h"
+#include "include/base/cef_logging.h"
+#include "include/base/cef_compiler_specific.h"
+#include "include/base/cef_weak_ptr.h"

 namespace base {
 namespace internal {
@@ -113,7 +113,9 @@ class CancelableCallbackImpl {
  }

  // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const { return callback_.is_null(); }
+  bool IsCancelled() const {
+    return callback_.is_null();
+  }

  // Sets |callback| as the closure that may be cancelled. |callback| may not
  // be null. Outstanding and any previously wrapped callbacks are cancelled.
@@ -178,6 +180,10 @@ using CancelableRepeatingCallback =
    internal::CancelableCallbackImpl<RepeatingCallback<Signature>>;
 using CancelableRepeatingClosure = CancelableRepeatingCallback<void()>;

+template <typename Signature>
+using CancelableCallback = CancelableRepeatingCallback<Signature>;
+using CancelableClosure = CancelableCallback<void()>;
+
 }  // namespace base

 #endif  // !USING_CHROMIUM_INCLUDES
--- a/include/base/cef_logging.h
+++ b/include/base/cef_logging.h
@@ -203,19 +203,19 @@ const LogSeverity LOG_DFATAL = LOG_FATAL;
 // by LOG() and LOG_IF, etc. Since these are used all over our code, it's
 // better to have compact code for these operations.
 #define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                    \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_INFO, \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_INFO, \
                          ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                    \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_WARNING, \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_WARNING, \
                          ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                    \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_ERROR, \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_ERROR, \
                          ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                    \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_FATAL, \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_FATAL, \
                          ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                    \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_DFATAL, \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_DFATAL, \
                          ##__VA_ARGS__)

 #define COMPACT_GOOGLE_LOG_INFO COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
--- a/include/capi/cef_accessibility_handler_capi.h
+++ b/include/capi/cef_accessibility_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=306e44d49ab6198a0fa1bcea50e8a25ee18672be$
+// $hash=c487e5fd787b1be8224a8981839e0cfdd0ed74f3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_
--- a/include/capi/cef_app_capi.h
+++ b/include/capi/cef_app_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=adfba3dd6479b96a95639c13ee1e07bed7b335d0$
+// $hash=a4b63e6e7942e3a3961b4f7141a963980178ae6f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_
--- a/include/capi/cef_audio_handler_capi.h
+++ b/include/capi/cef_audio_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=fd8d34089842ee8f8490ef1828c3091d12052e28$
+// $hash=7a483ed552ecca4f1aaa03800d366beca1ea2dee$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
--- a/include/capi/cef_auth_callback_capi.h
+++ b/include/capi/cef_auth_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=01a33de48ac9780f78d606d8aee2429ddb0c81a2$
+// $hash=2b9508a328ed0218e2c576af455f8d76e5978545$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
--- a/include/capi/cef_browser_capi.h
+++ b/include/capi/cef_browser_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8af93d03e0b2a6b50d7612b145599600285b76d4$
+// $hash=6e192c6e8a59c37e98e458578a287dd36b8ed90f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_
@@ -681,6 +681,12 @@ typedef struct _cef_browser_host_t {
  void(CEF_CALLBACK* send_touch_event)(struct _cef_browser_host_t* self,
                                       const struct _cef_touch_event_t* event);

+  ///
+  // Send a focus event to the browser.
+  ///
+  void(CEF_CALLBACK* send_focus_event)(struct _cef_browser_host_t* self,
+                                       int setFocus);
+
  ///
  // Send a capture lost event to the browser.
  ///
--- a/include/capi/cef_browser_process_handler_capi.h
+++ b/include/capi/cef_browser_process_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8c97f9b58c642c144cc37824ad820192640307cb$
+// $hash=ade537f836add7fe0b5fd94ceba26d678abb3e43$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
--- a/include/capi/cef_callback_capi.h
+++ b/include/capi/cef_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=10ef5088ce2a5c6ffb38f8864d3aad6e5ac88b40$
+// $hash=cd8c183355a6808abd763ecc0396b5da6c15b3f9$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
--- a/include/capi/cef_client_capi.h
+++ b/include/capi/cef_client_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8b099ca3b9cfbd41840cdf64586a0b884abaffae$
+// $hash=845a1d1dda63a06f4ae33ed39acfd2599b46a885$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
--- a/include/capi/cef_command_line_capi.h
+++ b/include/capi/cef_command_line_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=93f3d769c0d48ed6e1d91ad8a8e2f95d4ee54287$
+// $hash=5af5bf1e877dd53f21f751d332a9e2166817324c$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
@@ -53,9 +53,8 @@ extern "C" {
 // optionally have a value specified using the '=' delimiter (e.g.
 // "-switch=value"). An argument of "--" will terminate switch parsing with all
 // subsequent tokens, regardless of prefix, being interpreted as non-switch
-// arguments. Switch names should be lowercase ASCII and will be converted to
-// such if necessary. Switch values will retain the original case and UTF8
-// encoding. This structure can be used before cef_initialize() is called.
+// arguments. Switch names are considered case-insensitive. This structure can
+// be used before cef_initialize() is called.
 ///
 typedef struct _cef_command_line_t {
  ///
--- a/include/capi/cef_context_menu_handler_capi.h
+++ b/include/capi/cef_context_menu_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=fd33ce439e4379d231b6be16bdc1786f314d98e4$
+// $hash=175779df75a1405fcc5c337a09e6322c556698ba$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_
--- a/include/capi/cef_cookie_capi.h
+++ b/include/capi/cef_cookie_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d9790a35d74621e985b917935a4fca74ba7db1e0$
+// $hash=b19ef1c8a781f8d59276357609fe64370bb8a107$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
--- a/include/capi/cef_crash_util_capi.h
+++ b/include/capi/cef_crash_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0460e68eb7d1b1188706c42d14beafbf9a6f7126$
+// $hash=5e19231e3476eef376c2742e8d375bee7bd4ea2d$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_
--- a/include/capi/cef_devtools_message_observer_capi.h
+++ b/include/capi/cef_devtools_message_observer_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ec62239c2b24ff512b64ca758be825ff57fb3b6b$
+// $hash=1a256c04042ebd4867f39e1c31def558871b2bab$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
--- a/include/capi/cef_dialog_handler_capi.h
+++ b/include/capi/cef_dialog_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0f56154217707d141912dc8a298279df8df04311$
+// $hash=5ae5556e4085faf8cf17ee757f5eeac9197f75c0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
--- a/include/capi/cef_display_handler_capi.h
+++ b/include/capi/cef_display_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=142637539a094a03adc71d2f3f5b711ba64918b1$
+// $hash=067fd169a30bec1ad8eeacc5ab1ac750cf59640e$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
--- a/include/capi/cef_dom_capi.h
+++ b/include/capi/cef_dom_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c6de3fb4d64a2b2ad06a4b9c5e9d7625d40b5bb6$
+// $hash=0517dc6c42fdde9fecfc4549fab1ea12b614e143$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_
--- a/include/capi/cef_download_handler_capi.h
+++ b/include/capi/cef_download_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ec13ec3e2819e4ac49792c3a1c57bc60b45fb95b$
+// $hash=f0ceb73b289072a01c45c6e7abf339a4ec924d29$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
--- a/include/capi/cef_download_item_capi.h
+++ b/include/capi/cef_download_item_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b9f0d91dd2fdb3625365ff8b332b08e1f0ea1187$
+// $hash=d84044bb582b029af5fa46c75f35b3da948dffd2$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_
--- a/include/capi/cef_drag_data_capi.h
+++ b/include/capi/cef_drag_data_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b6e3236a062cd25ec26c3daeb1940d1e1bf0d96a$
+// $hash=9663321e2be1d000ac54e195c81f210ae40773d1$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
--- a/include/capi/cef_drag_handler_capi.h
+++ b/include/capi/cef_drag_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=5b2051c42c1d4c41b85ca823d34b26bfa5de6777$
+// $hash=1cc1f134e68406ae3b05f7e181e12f27262772f0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_
--- a/include/capi/cef_extension_capi.h
+++ b/include/capi/cef_extension_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=fcfe34c1517ebdb3f00c1f737b91361e771b820d$
+// $hash=5d5251098be1477705de2a21502dec2d8338ce00$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_
--- a/include/capi/cef_extension_handler_capi.h
+++ b/include/capi/cef_extension_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=768e2436e54cceb2675ddd03ebdc61b5c0785bdc$
+// $hash=c952241dabb9d99109ebb64acba0124e43150628$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_
--- a/include/capi/cef_file_util_capi.h
+++ b/include/capi/cef_file_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e76fa23e9682bf0865319d93e4009752ac8f854f$
+// $hash=00d75d4f1968686cec7db84a59df89d98d8fe146$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_
--- a/include/capi/cef_find_handler_capi.h
+++ b/include/capi/cef_find_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b1fe7f7db5ab92c6ae64dc1288b6fd47c80f9423$
+// $hash=03bb69a14868a95abf3bf7b1608dc351480e307f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FIND_HANDLER_CAPI_H_
--- a/include/capi/cef_focus_handler_capi.h
+++ b/include/capi/cef_focus_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a136a2679c8af339b21a89e8ae3090a9dbb8daa7$
+// $hash=0fccb41381e922e9d9545ae45ba3e6cf1916c4b0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_
--- a/include/capi/cef_frame_capi.h
+++ b/include/capi/cef_frame_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8527ceea6b8778d6fabc1b4ef82e4faa06ba777a$
+// $hash=872fd1e811d41f56f03da0da75a8f2e89cad40cd$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
--- a/include/capi/cef_frame_handler_capi.h
+++ b/include/capi/cef_frame_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8f791b2d1d5bea27f9e6ca5e0db731a0a76d181c$
+// $hash=503984bf98aa52ff67ce52f26a560bbb1d4439bc$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_
@@ -147,14 +147,11 @@ typedef struct _cef_frame_handler_t {

  ///
  // Called when a frame can begin routing commands to/from the associated
-  // renderer process. |reattached| will be true (1) if the frame was re-
-  // attached after exiting the BackForwardCache. Any commands that were queued
-  // have now been dispatched.
+  // renderer process. Any commands that were queued have now been dispatched.
  ///
  void(CEF_CALLBACK* on_frame_attached)(struct _cef_frame_handler_t* self,
                                        struct _cef_browser_t* browser,
-                                        struct _cef_frame_t* frame,
-                                        int reattached);
+                                        struct _cef_frame_t* frame);

  ///
  // Called when a frame loses its connection to the renderer process and will
--- a/include/capi/cef_image_capi.h
+++ b/include/capi/cef_image_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b5a36ef39ff250c9d3cb1e9a8c7ee38d7e0f8b3f$
+// $hash=d9da8862142742e780086714bbd4fb44ac95cf2c$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
--- a/include/capi/cef_jsdialog_handler_capi.h
+++ b/include/capi/cef_jsdialog_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c68332a779bab425aa2e6a858d20a43448631890$
+// $hash=d991e2a7d1a58a013e4d3a963361fed6918f4ec3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_
--- a/include/capi/cef_keyboard_handler_capi.h
+++ b/include/capi/cef_keyboard_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=140d3a3ce78f5e8ab50a24a2fd6377e7a8ea3256$
+// $hash=d804a2db0f9ac13afd249407c85cb8d5852508ac$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_
--- a/include/capi/cef_life_span_handler_capi.h
+++ b/include/capi/cef_life_span_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=34a6559587adbd0dc3143989a8c6e49e0664b43e$
+// $hash=e44bb89a337942c82bfa246275b4b033821b2782$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_
--- a/include/capi/cef_load_handler_capi.h
+++ b/include/capi/cef_load_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f51b6a0dbf264fa43ea3199327a5adb1044bfc04$
+// $hash=6c6a719d7cbbc01adfdc9bbe0dff6da10e06e3f3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_
--- a/include/capi/cef_media_router_capi.h
+++ b/include/capi/cef_media_router_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3db7459a1940c37898699cc97f69ba9249a6f1fd$
+// $hash=79e4e38c732c0cfeef495c8a9726e105054012bb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
--- a/include/capi/cef_menu_model_capi.h
+++ b/include/capi/cef_menu_model_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=9f30f2caa9eedc0d4fe963dbf0127602ffcbec61$
+// $hash=28fa978051bd3ddff69d58e0dc8f445f64a61480$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
--- a/include/capi/cef_menu_model_delegate_capi.h
+++ b/include/capi/cef_menu_model_delegate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=bdb670bcaa9eb9f5748900ad25bcc061155d6076$
+// $hash=edc411cb0447a6c2965cdeb5f709fe56c43ec2bb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
--- a/include/capi/cef_navigation_entry_capi.h
+++ b/include/capi/cef_navigation_entry_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3a7dd4a6a1b5e0d9191be6c4dd2f0135f43de643$
+// $hash=f14afbd6941bcb37b14cce81569882512c3d7194$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_
--- a/include/capi/cef_origin_whitelist_capi.h
+++ b/include/capi/cef_origin_whitelist_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0939a44345bea8df7ca5f1dbd6afbe41972121f2$
+// $hash=6798e6147540596c1abac8c7457d9d1d4d99bd54$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_
--- a/include/capi/cef_parser_capi.h
+++ b/include/capi/cef_parser_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f5e1c0fc43c6e85dbafa66975d9dc5e2bc7be69f$
+// $hash=84149324b177c47287b935dcb3d5900a33acfdf5$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
--- a/include/capi/cef_path_util_capi.h
+++ b/include/capi/cef_path_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=41ddd04d4efb147b05eb93816af1591ec3b61b76$
+// $hash=0ae1fe7f7141eb05eb7fd44c2d41e4c576afae1e$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_
--- a/include/capi/cef_print_handler_capi.h
+++ b/include/capi/cef_print_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e26be3efc18d8c79d019c02b1d73a7ec2866b142$
+// $hash=84fc58b3898f25476d9cdd260553390ba5e0b30b$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_HANDLER_CAPI_H_
--- a/include/capi/cef_print_settings_capi.h
+++ b/include/capi/cef_print_settings_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=fdbd26f9dd20dbd7813fc17a8c34650b2da19581$
+// $hash=4b52323c4ce2d0ebcc3438e16fc9a9b181a58adc$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_
--- a/include/capi/cef_process_message_capi.h
+++ b/include/capi/cef_process_message_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=2549ea10cd3a41bc04ab81bad24eb12787de68b9$
+// $hash=53ff22b73527aa331d2bd96e008f4cb4f0413042$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_
--- a/include/capi/cef_process_util_capi.h
+++ b/include/capi/cef_process_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=1f2b752c4e314b240ce95cb3b87863c2f99534a8$
+// $hash=c476a8d22852994d9d9695db901efaef13bbfc9d$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_
--- a/include/capi/cef_registration_capi.h
+++ b/include/capi/cef_registration_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d5efa37953d0f0097fef20bc18f4938621c6b168$
+// $hash=8cde223bdb8d25ff163edd95da0d9e238b298016$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REGISTRATION_CAPI_H_
--- a/include/capi/cef_render_handler_capi.h
+++ b/include/capi/cef_render_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=79fba8a1a86cc65251dd7251e0863dd20205bb3b$
+// $hash=e4bdab963041a270edabc0954b415eb4cae8e5cb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
--- a/include/capi/cef_render_process_handler_capi.h
+++ b/include/capi/cef_render_process_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=0b8abb0e55cb56fcb778ced72a61a108c2b28011$
+// $hash=4ebf99611a11cc8714d710c37417fbd9f50f0618$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_
--- a/include/capi/cef_request_callback_capi.h
+++ b/include/capi/cef_request_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,11 +33,11 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b6168013910802cf6d7603892741385958026dcd$
+// $hash=273af5bd01c6ab5d4df8efb2af2b4e2da9c21760$
 //

-#ifndef CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_
+#ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CALLBACK_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_REQUEST_CALLBACK_CAPI_H_
 #pragma once

 #include "include/capi/cef_base_capi.h"
@@ -47,12 +47,28 @@ extern "C" {
 #endif

 ///
-// Returns true (1) if the application text direction is right-to-left.
+// Callback structure used for asynchronous continuation of url requests.
 ///
-CEF_EXPORT int cef_is_rtl();
+typedef struct _cef_request_callback_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_ref_counted_t base;
+
+  ///
+  // Continue the url request. If |allow| is true (1) the request will be
+  // continued. Otherwise, the request will be canceled.
+  ///
+  void(CEF_CALLBACK* cont)(struct _cef_request_callback_t* self, int allow);
+
+  ///
+  // Cancel the url request.
+  ///
+  void(CEF_CALLBACK* cancel)(struct _cef_request_callback_t* self);
+} cef_request_callback_t;

 #ifdef __cplusplus
 }
 #endif

-#endif  // CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_
+#endif  // CEF_INCLUDE_CAPI_CEF_REQUEST_CALLBACK_CAPI_H_
--- a/include/capi/cef_request_capi.h
+++ b/include/capi/cef_request_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=47b361878452f2a94e559782913d80beb0dba25a$
+// $hash=a5e9055958c3588d583d4d128a5d7c8639f39946$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_
--- a/include/capi/cef_request_context_capi.h
+++ b/include/capi/cef_request_context_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=89e64a2db658ad560e85ea5d3e564a6505d4e914$
+// $hash=2e42334fc22050e207e5a0af6fe290a592e4105f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
@@ -165,6 +165,17 @@ typedef struct _cef_request_context_t {
  int(CEF_CALLBACK* clear_scheme_handler_factories)(
      struct _cef_request_context_t* self);

+  ///
+  // Tells all renderer processes associated with this context to throw away
+  // their plugin list cache. If |reload_pages| is true (1) they will also
+  // reload all pages with plugins.
+  // cef_request_context_handler_t::OnBeforePluginLoad may be called to rebuild
+  // the plugin list cache.
+  ///
+  void(CEF_CALLBACK* purge_plugin_list_cache)(
+      struct _cef_request_context_t* self,
+      int reload_pages);
+
  ///
  // Returns true (1) if a preference with the specified |name| exists. This
  // function must be called on the browser process UI thread.
--- a/include/capi/cef_request_context_handler_capi.h
+++ b/include/capi/cef_request_context_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=b44d320d5cceb5022543e8154170b8d276628c76$
+// $hash=fa148db8a0ecd79966814086fb92e439687be701$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_
@@ -70,6 +70,34 @@ typedef struct _cef_request_context_handler_t {
      struct _cef_request_context_handler_t* self,
      struct _cef_request_context_t* request_context);

+  ///
+  // Called on multiple browser process threads before a plugin instance is
+  // loaded. |mime_type| is the mime type of the plugin that will be loaded.
+  // |plugin_url| is the content URL that the plugin will load and may be NULL.
+  // |is_main_frame| will be true (1) if the plugin is being loaded in the main
+  // (top-level) frame, |top_origin_url| is the URL for the top-level frame that
+  // contains the plugin when loading a specific plugin instance or NULL when
+  // building the initial list of enabled plugins for 'navigator.plugins'
+  // JavaScript state. |plugin_info| includes additional information about the
+  // plugin that will be loaded. |plugin_policy| is the recommended policy.
+  // Modify |plugin_policy| and return true (1) to change the policy. Return
+  // false (0) to use the recommended policy. The default plugin policy can be
+  // set at runtime using the `--plugin-policy=[allow|detect|block]` command-
+  // line flag. Decisions to mark a plugin as disabled by setting
+  // |plugin_policy| to PLUGIN_POLICY_DISABLED may be cached when
+  // |top_origin_url| is NULL. To purge the plugin list cache and potentially
+  // trigger new calls to this function call
+  // cef_request_context_t::PurgePluginListCache.
+  ///
+  int(CEF_CALLBACK* on_before_plugin_load)(
+      struct _cef_request_context_handler_t* self,
+      const cef_string_t* mime_type,
+      const cef_string_t* plugin_url,
+      int is_main_frame,
+      const cef_string_t* top_origin_url,
+      struct _cef_web_plugin_info_t* plugin_info,
+      cef_plugin_policy_t* plugin_policy);
+
  ///
  // Called on the browser process IO thread before a resource request is
  // initiated. The |browser| and |frame| values represent the source of the
--- a/include/capi/cef_request_handler_capi.h
+++ b/include/capi/cef_request_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=4a05a0a7cd4a279ccf8455a3cb2f77de581b597a$
+// $hash=1d8b3f540a8305ce1738c5fe7c716434062c67b0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_
@@ -43,8 +43,8 @@
 #include "include/capi/cef_auth_callback_capi.h"
 #include "include/capi/cef_base_capi.h"
 #include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_callback_capi.h"
 #include "include/capi/cef_frame_capi.h"
+#include "include/capi/cef_request_callback_capi.h"
 #include "include/capi/cef_request_capi.h"
 #include "include/capi/cef_resource_request_handler_capi.h"
 #include "include/capi/cef_ssl_info_capi.h"
@@ -180,30 +180,31 @@ typedef struct _cef_request_handler_t {
  // size via the webkitStorageInfo.requestQuota function. |origin_url| is the
  // origin of the page making the request. |new_size| is the requested quota
  // size in bytes. Return true (1) to continue the request and call
-  // cef_callback_t functions either in this function or at a later time to
-  // grant or deny the request. Return false (0) to cancel the request
+  // cef_request_callback_t::cont() either in this function or at a later time
+  // to grant or deny the request. Return false (0) to cancel the request
  // immediately.
  ///
  int(CEF_CALLBACK* on_quota_request)(struct _cef_request_handler_t* self,
                                      struct _cef_browser_t* browser,
                                      const cef_string_t* origin_url,
                                      int64 new_size,
-                                      struct _cef_callback_t* callback);
+                                      struct _cef_request_callback_t* callback);

  ///
  // Called on the UI thread to handle requests for URLs with an invalid SSL
-  // certificate. Return true (1) and call cef_callback_t functions either in
-  // this function or at a later time to continue or cancel the request. Return
-  // false (0) to cancel the request immediately. If
+  // certificate. Return true (1) and call cef_request_callback_t::cont() either
+  // in this function or at a later time to continue or cancel the request.
+  // Return false (0) to cancel the request immediately. If
  // CefSettings.ignore_certificate_errors is set all invalid certificates will
  // be accepted without calling this function.
  ///
-  int(CEF_CALLBACK* on_certificate_error)(struct _cef_request_handler_t* self,
-                                          struct _cef_browser_t* browser,
-                                          cef_errorcode_t cert_error,
-                                          const cef_string_t* request_url,
-                                          struct _cef_sslinfo_t* ssl_info,
-                                          struct _cef_callback_t* callback);
+  int(CEF_CALLBACK* on_certificate_error)(
+      struct _cef_request_handler_t* self,
+      struct _cef_browser_t* browser,
+      cef_errorcode_t cert_error,
+      const cef_string_t* request_url,
+      struct _cef_sslinfo_t* ssl_info,
+      struct _cef_request_callback_t* callback);

  ///
  // Called on the UI thread when a client certificate is being requested for
--- a/include/capi/cef_resource_bundle_capi.h
+++ b/include/capi/cef_resource_bundle_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a9e35ca17785f77666db7650208cacfd9a85c3e0$
+// $hash=ffe0de3b50e0a612bd1b055b873c265b030e721d$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_
--- a/include/capi/cef_resource_bundle_handler_capi.h
+++ b/include/capi/cef_resource_bundle_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3d7b3d4702c8d35dc8780f9e87eb7560d6ce1dee$
+// $hash=b9723e0dfe6d03c24665eac2264396743a5254df$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_HANDLER_CAPI_H_
--- a/include/capi/cef_resource_handler_capi.h
+++ b/include/capi/cef_resource_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=67df3d56f0cc0f58d2b0a2fe884bbb2c1c39813f$
+// $hash=a9598f4e94a864e749b425aa62bc519589f5753e$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_
--- a/include/capi/cef_resource_request_handler_capi.h
+++ b/include/capi/cef_resource_request_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3d5c3c54c9f7eedc5cd1dd61c0f69edcd6a1143a$
+// $hash=aec52d0efc8407495fe1fc4821616673da7ed17a$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_REQUEST_HANDLER_CAPI_H_
@@ -42,8 +42,8 @@

 #include "include/capi/cef_base_capi.h"
 #include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_callback_capi.h"
 #include "include/capi/cef_frame_capi.h"
+#include "include/capi/cef_request_callback_capi.h"
 #include "include/capi/cef_request_capi.h"
 #include "include/capi/cef_resource_handler_capi.h"
 #include "include/capi/cef_response_capi.h"
@@ -87,8 +87,8 @@ typedef struct _cef_resource_request_handler_t {
  // or change the resource load optionally modify |request|. Modification of
  // the request URL will be treated as a redirect. Return RV_CONTINUE to
  // continue the request immediately. Return RV_CONTINUE_ASYNC and call
-  // cef_callback_t functions at a later time to continue or cancel the request
-  // asynchronously. Return RV_CANCEL to cancel the request immediately.
+  // cef_request_callback_t:: cont() at a later time to continue or cancel the
+  // request asynchronously. Return RV_CANCEL to cancel the request immediately.
  //
  ///
  cef_return_value_t(CEF_CALLBACK* on_before_resource_load)(
@@ -96,7 +96,7 @@ typedef struct _cef_resource_request_handler_t {
      struct _cef_browser_t* browser,
      struct _cef_frame_t* frame,
      struct _cef_request_t* request,
-      struct _cef_callback_t* callback);
+      struct _cef_request_callback_t* callback);

  ///
  // Called on the IO thread before a resource is loaded. The |browser| and
--- a/include/capi/cef_response_capi.h
+++ b/include/capi/cef_response_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=6ebf7adcdaee57772810c1528b27140ae95966d0$
+// $hash=8202bbf8e7f7ae474182c483f0f599b13f6914eb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_
--- a/include/capi/cef_response_filter_capi.h
+++ b/include/capi/cef_response_filter_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=fb06b9630b95fedb5d202aab7814d914ab7c943b$
+// $hash=cdadf516dc77455c5a3d6633bfb12e1cb276b9bb$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESPONSE_FILTER_CAPI_H_
--- a/include/capi/cef_scheme_capi.h
+++ b/include/capi/cef_scheme_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=df8c46dd19ef6a3964c49d79e770de6e4245e208$
+// $hash=9384e0b2bc27ccbdd7ebb1a86f213c28fd2784a1$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_SCHEME_CAPI_H_
--- a/include/capi/cef_server_capi.h
+++ b/include/capi/cef_server_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=72c2b4f976016cea50e54a386c09a786973c01a3$
+// $hash=37b3332057dbcf705b61a51cf14640d171d18a74$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_SERVER_CAPI_H_
--- a/include/capi/cef_ssl_info_capi.h
+++ b/include/capi/cef_ssl_info_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d72f3b34b4150f29f1491b2c729f4a8afc4a33f4$
+// $hash=aefb3b63aba8f5df6ab6dc11e2029820c75c36cf$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_SSL_INFO_CAPI_H_
--- a/include/capi/cef_ssl_status_capi.h
+++ b/include/capi/cef_ssl_status_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=1bc8a73a196fbbb6cec3dd1738b817575b17706d$
+// $hash=93eb2bc0f51da08a41fb906436654b3452b74fb3$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_SSL_STATUS_CAPI_H_
--- a/include/capi/cef_stream_capi.h
+++ b/include/capi/cef_stream_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=87f6cad177614ece33d9574f0f2964e5bb97d613$
+// $hash=61ff7a4ebc917482bad5daba7089b92cc62bada8$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_STREAM_CAPI_H_
--- a/include/capi/cef_string_visitor_capi.h
+++ b/include/capi/cef_string_visitor_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=398537ec88bfe902c49908db4a549da297594b70$
+// $hash=30d4a63d53bce310ad641cbe5096ae126a664076$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_STRING_VISITOR_CAPI_H_
--- a/include/capi/cef_task_capi.h
+++ b/include/capi/cef_task_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e943dd2af818e5a5f19f6cbd1648896684c666c6$
+// $hash=a8b2162b7c3b7cede392e8531c46a1277e990689$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_TASK_CAPI_H_
--- a/include/capi/cef_thread_capi.h
+++ b/include/capi/cef_thread_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d99ffc2270c1cf8b0f06dd08c1b6e9b27cee4bc8$
+// $hash=9a471c97e43ad3d1d042ba3dc6d887f2f4b0d851$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_THREAD_CAPI_H_
--- a/include/capi/cef_trace_capi.h
+++ b/include/capi/cef_trace_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a7b4410e0a35eb0aba747014665419fb6b6fcb67$
+// $hash=99779f8a728d2e1a0b87d6d6b89bd28e5da16d4c$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_TRACE_CAPI_H_
--- a/include/capi/cef_urlrequest_capi.h
+++ b/include/capi/cef_urlrequest_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a14d77cd7756797afb4db3d28a2359da53011bfa$
+// $hash=11c227079ec0687adeaa8a085aeec37c89346ee7$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_
--- a/include/capi/cef_v8_capi.h
+++ b/include/capi/cef_v8_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=2bdcad7f8e3c03285a5e5ddb9a02a5a2182f254c$
+// $hash=23dc3ab761547687a491e5d7303b73b2d0d54e7a$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_V8_CAPI_H_
--- a/include/capi/cef_values_capi.h
+++ b/include/capi/cef_values_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c557496bdc1403b25b22ca9354a942478131c7ce$
+// $hash=d9074be0e6960c69cfe2c39b92b4dd6f529210d1$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_VALUES_CAPI_H_
--- a/include/capi/cef_waitable_event_capi.h
+++ b/include/capi/cef_waitable_event_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=aff380a4fa3f1a26063170381d47c67971511f1d$
+// $hash=ed698ff6cb09ee2ed87614e2733c742db827ed4f$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_WAITABLE_EVENT_CAPI_H_
--- a/include/capi/cef_web_plugin_capi.h
+++ b/include/capi/cef_web_plugin_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=51060280dee57104eaef7b774e4b4895970c0057$
+// $hash=f51ad9ffc67d94b9cbfad154e7f224111c2a96fa$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_
--- a/include/capi/cef_x509_certificate_capi.h
+++ b/include/capi/cef_x509_certificate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=32b942f6b50b842ddec08addc2b5794f2a272dbe$
+// $hash=e06ad8a1e173edd1e888ce6a8f8a9d95394e6a44$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_X509_CERTIFICATE_CAPI_H_
--- a/include/capi/cef_xml_reader_capi.h
+++ b/include/capi/cef_xml_reader_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c3bdf957dfd307568842b95599e3259d4c8d8f44$
+// $hash=76de25a0d0f0a2cc4657f46c26ec44b6d7d937e8$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_XML_READER_CAPI_H_
--- a/include/capi/cef_zip_reader_capi.h
+++ b/include/capi/cef_zip_reader_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ac91bcd40e1439ee1e742cc47989530b112c99bd$
+// $hash=d3d4ee91a69edd5f12785871b5c5a55e86c5c675$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_ZIP_READER_CAPI_H_
--- a/include/capi/test/cef_test_helpers_capi.h
+++ b/include/capi/test/cef_test_helpers_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=584acfdb7be699b0192c46ac9fa88084f141e845$
+// $hash=f9db602ed3bcb4b8ceb583034db9d0297b2961fd$
 //

 #ifndef CEF_INCLUDE_CAPI_TEST_CEF_TEST_HELPERS_CAPI_H_
--- a/include/capi/test/cef_translator_test_capi.h
+++ b/include/capi/test/cef_translator_test_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d70d5b74890e3ca91f01333ebdb4f3298caeb619$
+// $hash=a20dfae14509f99270e5ce1422790681aee2d5f2$
 //

 #ifndef CEF_INCLUDE_CAPI_TEST_CEF_TRANSLATOR_TEST_CAPI_H_
--- a/include/capi/views/cef_box_layout_capi.h
+++ b/include/capi/views/cef_box_layout_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=bf1d1dc95fa2053645a348d6f554688b9d06c83a$
+// $hash=069553694811acdd7a7871c895d73fc4f3e2798a$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BOX_LAYOUT_CAPI_H_
--- a/include/capi/views/cef_browser_view_capi.h
+++ b/include/capi/views/cef_browser_view_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=9ae10b92eed7495112c94825521ac46fb9327ef7$
+// $hash=3e4eb9ed3a0cb28ae0459a50f20c8405c7722437$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_CAPI_H_
--- a/include/capi/views/cef_browser_view_delegate_capi.h
+++ b/include/capi/views/cef_browser_view_delegate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=520df1f3e00efbffc9d499149f2f797bf0f85c99$
+// $hash=220a126af3682f716f10b9019e8d1461702aa7c9$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BROWSER_VIEW_DELEGATE_CAPI_H_
--- a/include/capi/views/cef_button_capi.h
+++ b/include/capi/views/cef_button_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=5ebbf84a506d3d4d0bfb3d8db48f060a682f1ac9$
+// $hash=eb8e4197f2dba4829b1ed54957e1d5043fb8adaa$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BUTTON_CAPI_H_
--- a/include/capi/views/cef_button_delegate_capi.h
+++ b/include/capi/views/cef_button_delegate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=9f1752ee949e98662a718de764e83f26ce06ec26$
+// $hash=f4c4a72bf4db6abaf709f5ce4fb648c2532c85bc$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_BUTTON_DELEGATE_CAPI_H_
--- a/include/capi/views/cef_display_capi.h
+++ b/include/capi/views/cef_display_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=2fd0db428ce5902d59a7802c901e1c13b2367b5a$
+// $hash=1f9c61687a16a5c095c73afd47c1c0a27096ab3c$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_DISPLAY_CAPI_H_
--- a/include/capi/views/cef_fill_layout_capi.h
+++ b/include/capi/views/cef_fill_layout_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=13972453cdca328c6ee81249aeb202d80da6d290$
+// $hash=967f99321db8d0a900e33f3032b3ba1a6bd6bc9c$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_FILL_LAYOUT_CAPI_H_
--- a/include/capi/views/cef_label_button_capi.h
+++ b/include/capi/views/cef_label_button_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=de3e738efca85a84422c92fa8504b24ed4efab8a$
+// $hash=ae11ffbfed64dc255909f01a7abccbf6acfb5922$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LABEL_BUTTON_CAPI_H_
--- a/include/capi/views/cef_layout_capi.h
+++ b/include/capi/views/cef_layout_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=6ef0d3d4390654fc1460a2ff586f2bbfd62e96b8$
+// $hash=6a10260132a69996885e20fe54f552fca6f0862b$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LAYOUT_CAPI_H_
--- a/include/capi/views/cef_menu_button_capi.h
+++ b/include/capi/views/cef_menu_button_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=925b09f77cd71327a447bf5c9601cc21a7eb7c3a$
+// $hash=56ea894f85a5ec444d7899d8ccb548e34b4ba891$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_MENU_BUTTON_CAPI_H_
--- a/include/capi/views/cef_menu_button_delegate_capi.h
+++ b/include/capi/views/cef_menu_button_delegate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ca7948602a0d20a5bd0271065d79e8679898eff6$
+// $hash=d04871b1f67c5074874d68a50e14e9746d1f175d$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_MENU_BUTTON_DELEGATE_CAPI_H_
--- a/include/capi/views/cef_overlay_controller_capi.h
+++ b/include/capi/views/cef_overlay_controller_capi.h
@@ -1,216 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=14eaca76dba704ee64f454aaca821a6818012fc6$
-//
-
-#ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_OVERLAY_CONTROLLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_VIEWS_CEF_OVERLAY_CONTROLLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_view_t;
-struct _cef_window_t;
-
-///
-// Controller for an overlay that contains a contents View added via
-// cef_window_t::AddOverlayView. Methods exposed by this controller should be
-// called in preference to functions of the same name exposed by the contents
-// View unless otherwise indicated. Methods must be called on the browser
-// process UI thread unless otherwise indicated.
-///
-typedef struct _cef_overlay_controller_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this object is valid.
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_overlay_controller_t* self);
-
-  ///
-  // Returns true (1) if this object is the same as |that| object.
-  ///
-  int(CEF_CALLBACK* is_same)(struct _cef_overlay_controller_t* self,
-                             struct _cef_overlay_controller_t* that);
-
-  ///
-  // Returns the contents View for this overlay.
-  ///
-  struct _cef_view_t*(CEF_CALLBACK* get_contents_view)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Returns the top-level Window hosting this overlay. Use this function
-  // instead of calling get_window() on the contents View.
-  ///
-  struct _cef_window_t*(CEF_CALLBACK* get_window)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Returns the docking mode for this overlay.
-  ///
-  cef_docking_mode_t(CEF_CALLBACK* get_docking_mode)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Destroy this overlay.
-  ///
-  void(CEF_CALLBACK* destroy)(struct _cef_overlay_controller_t* self);
-
-  ///
-  // Sets the bounds (size and position) of this overlay. This will set the
-  // bounds of the contents View to match and trigger a re-layout if necessary.
-  // |bounds| is in parent coordinates and any insets configured on this overlay
-  // will be ignored. Use this function only for overlays created with a docking
-  // mode value of CEF_DOCKING_MODE_CUSTOM. With other docking modes modify the
-  // insets of this overlay and/or layout of the contents View and call
-  // size_to_preferred_size() instead to calculate the new size and re-position
-  // the overlay if necessary.
-  ///
-  void(CEF_CALLBACK* set_bounds)(struct _cef_overlay_controller_t* self,
-                                 const cef_rect_t* bounds);
-
-  ///
-  // Returns the bounds (size and position) of this overlay in parent
-  // coordinates.
-  ///
-  cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_overlay_controller_t* self);
-
-  ///
-  // Returns the bounds (size and position) of this overlay in DIP screen
-  // coordinates.
-  ///
-  cef_rect_t(CEF_CALLBACK* get_bounds_in_screen)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Sets the size of this overlay without changing the position. This will set
-  // the size of the contents View to match and trigger a re-layout if
-  // necessary. |size| is in parent coordinates and any insets configured on
-  // this overlay will be ignored. Use this function only for overlays created
-  // with a docking mode value of CEF_DOCKING_MODE_CUSTOM. With other docking
-  // modes modify the insets of this overlay and/or layout of the contents View
-  // and call size_to_preferred_size() instead to calculate the new size and re-
-  // position the overlay if necessary.
-  ///
-  void(CEF_CALLBACK* set_size)(struct _cef_overlay_controller_t* self,
-                               const cef_size_t* size);
-
-  ///
-  // Returns the size of this overlay in parent coordinates.
-  ///
-  cef_size_t(CEF_CALLBACK* get_size)(struct _cef_overlay_controller_t* self);
-
-  ///
-  // Sets the position of this overlay without changing the size. |position| is
-  // in parent coordinates and any insets configured on this overlay will be
-  // ignored. Use this function only for overlays created with a docking mode
-  // value of CEF_DOCKING_MODE_CUSTOM. With other docking modes modify the
-  // insets of this overlay and/or layout of the contents View and call
-  // size_to_preferred_size() instead to calculate the new size and re-position
-  // the overlay if necessary.
-  ///
-  void(CEF_CALLBACK* set_position)(struct _cef_overlay_controller_t* self,
-                                   const cef_point_t* position);
-
-  ///
-  // Returns the position of this overlay in parent coordinates.
-  ///
-  cef_point_t(CEF_CALLBACK* get_position)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Sets the insets for this overlay. |insets| is in parent coordinates. Use
-  // this function only for overlays created with a docking mode value other
-  // than CEF_DOCKING_MODE_CUSTOM.
-  ///
-  void(CEF_CALLBACK* set_insets)(struct _cef_overlay_controller_t* self,
-                                 const cef_insets_t* insets);
-
-  ///
-  // Returns the insets for this overlay in parent coordinates.
-  ///
-  cef_insets_t(CEF_CALLBACK* get_insets)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Size this overlay to its preferred size and trigger a re-layout if
-  // necessary. The position of overlays created with a docking mode value of
-  // CEF_DOCKING_MODE_CUSTOM will not be modified by calling this function. With
-  // other docking modes this function may re-position the overlay if necessary
-  // to accommodate the new size and any insets configured on the contents View.
-  ///
-  void(CEF_CALLBACK* size_to_preferred_size)(
-      struct _cef_overlay_controller_t* self);
-
-  ///
-  // Sets whether this overlay is visible. Overlays are hidden by default. If
-  // this overlay is hidden then it and any child Views will not be drawn and,
-  // if any of those Views currently have focus, then focus will also be
-  // cleared. Painting is scheduled as needed.
-  ///
-  void(CEF_CALLBACK* set_visible)(struct _cef_overlay_controller_t* self,
-                                  int visible);
-
-  ///
-  // Returns whether this overlay is visible. A View may be visible but still
-  // not drawn in a Window if any parent Views are hidden. Call is_drawn() to
-  // determine whether this overlay and all parent Views are visible and will be
-  // drawn.
-  ///
-  int(CEF_CALLBACK* is_visible)(struct _cef_overlay_controller_t* self);
-
-  ///
-  // Returns whether this overlay is visible and drawn in a Window. A View is
-  // drawn if it and all parent Views are visible. To determine if the
-  // containing Window is visible to the user on-screen call is_visible() on the
-  // Window.
-  ///
-  int(CEF_CALLBACK* is_drawn)(struct _cef_overlay_controller_t* self);
-} cef_overlay_controller_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_VIEWS_CEF_OVERLAY_CONTROLLER_CAPI_H_
--- a/include/capi/views/cef_panel_capi.h
+++ b/include/capi/views/cef_panel_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,7 +33,7 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d5311ffa72e57d240f6963b1f45a278041bd33f4$
+// $hash=9a56cb55b4454c640ec9edf0af58fbdf7142c129$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_PANEL_CAPI_H_
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marshall Greenblatt	f38ce3409c	Don't use NotificationStateLock for GetMainFrame (see issue #2421 ) This causes a race related to \|notification_state_lock_\| assignment when GetMainFrame is called from multiple threads. GetMainFrame doesn't trigger any notifications so it shouldn't need that lock. Instead, only use NotificationStateLock on the UI thread.	2021-09-16 20:06:16 +03:00
Marshall Greenblatt	bda9e30ec9	Remove usage of FrameTreeNode IDs (see issue #2421 ) With the introduction of prerendering in Chromium it is now possible for RenderFrameHosts (RFH) to move between FrameTrees. As a consequence we can no longer rely on FrameTreeNode IDs to uniquely identify a RFH over its lifespan. We must now switch to using GlobalRenderFrameHostId (child_id, frame_routing_id) instead for that purpose. Additionally, we simplify existing code by using the GlobalRenderFrameHostId struct in all places that previously used a (render_process_id, render_frame_id) pair, since these concepts are equivalent. See https://crbug.com/1179502#c8 for additional background.	2021-09-16 20:06:16 +03:00
CEF Spotify	a8ffe4b9f1	Update to Chromium version 93.0.4577.82	2021-09-15 08:43:20 +00:00
CEF Spotify	9e254face2	Update to Chromium version 93.0.4577.63	2021-09-01 21:30:32 +00:00
CEF Spotify	f6bc8313a6	Update to Chromium version 93.0.4577.58	2021-08-25 21:08:49 +00:00
Marshall Greenblatt	da15ac5867	Linux: Pass log-file to zygote subprocesses This fixes a DCHECK(!log_file.empty()) due to commit `2ecf6f1`.	2021-08-24 12:22:37 -04:00
Marshall Greenblatt	293645e049	Update to Chromium version 93.0.4577.51	2021-08-23 21:12:57 -04:00
Marshall Greenblatt	9117d6a394	Fix ExecuteJavaScript failure with null CefRenderProcessHandler (see issue #2421 ) When CefApp::GetRenderProcessHandler returned null CefRenderFrameObserver::DidCreateScriptContext was returning early (not calling CefFrameImpl::OnContextCreated) and consequently queued actions such as JavaScript were never executed.	2021-08-18 18:06:27 -04:00
Marshall Greenblatt	3a8409fde7	Remove unicode character from cef_bind_internal.h This can cause compile errors on non-English Windows versions.	2021-08-16 13:26:22 -04:00
Marshall Greenblatt	860bf38e47	Update to Chromium version 93.0.4577.42	2021-08-13 17:53:35 -04:00
Marshall Greenblatt	33482208b6	Fix duplicate log-file entry on sub-process command-line	2021-08-11 13:27:58 -04:00
Marshall Greenblatt	b4cf6e54de	Linux: Update user data path docs (see issue #3149 )	2021-08-11 13:16:17 -04:00
Marshall Greenblatt	64221256a0	Mac: Update CFBundleIdentifier for the CEF framework	2021-08-11 12:42:52 -04:00
Marshall Greenblatt	6a52098b62	widevine: Fix ARM compile error due to unused variable (see issue #3149 ) alloy_browser_main.cc:223:17: error: unused variable 'cus' [-Werror,-Wunused-variable] auto* const cus = g_browser_process->component_updater();	2021-08-10 12:07:23 -04:00
Marshall Greenblatt	5a0b3ea937	widevine: Use component updater with the Alloy runtime (fixes issue #3149 ) Widevine CDM binaries will be downloaded on supported platforms shortly after application startup. Widevine support will then become available within a few seconds after successful installation on Windows or after the next application restart on other platforms. The CDM files will be downloaded to a "WidevineCdm" directory inside the `CefSettings.user_data_path` directory. Pass the `--disable-component-update` command-line flag to disable Widevine download and installation. Pass the `--component-updater=fast-update` command- line flag to force Widevine download immediately after application startup. See the related issue for additional usage details.	2021-08-09 21:28:39 -04:00
CEF Spotify	e747782ece	Update to Chromium version 93.0.4577.25	2021-08-05 15:32:06 +00:00
Marshall Greenblatt	2565243720	chrome: Fix AssertBlockingAllowed() with disk-based Profile creation (see issue #2969 )	2021-08-04 15:20:57 -04:00
Marshall Greenblatt	4994313a5b	views: Fix multiple issues with hide-frame (fixes issue #3168 )	2021-08-04 14:35:41 -04:00
Marshall Greenblatt	a20b5f35ef	Mac: ceftests: Fix component build error due to unresolved symbols	2021-07-30 13:33:33 -04:00
Marshall Greenblatt	0ae112ea32	Win/Mac: Generate build configs for the native host architecture by default (see issue #2773 , see issue #2981 ) When building on an ARM64 host the ARM64 configs (arm64) will be generated by default and the AMD64 configs (x86,x64) will only be generated if the CEF_ENABLE_AMD64=1 env variable is set. When building on an AMD64 host the AMD64 configs (x86,x64) will be generated by default and the ARM64 configs (arm64) will only be generated if the CEF_ENABLE_ARM64=1 env variable is set.	2021-07-30 13:33:26 -04:00
CEF Spotify	6ebdfec451	Update to Chromium version 93.0.4577.18	2021-07-30 17:29:40 +00:00
Marshall Greenblatt	98fe2d01e1	Update depot_tools to fix https://crbug.com/1234506	2021-07-29 22:17:13 +00:00
Marshall Greenblatt	2d46bb789e	Update to Chromium version 93.0.4577.15	2021-07-28 21:29:46 -04:00