Fix AltGr handling for OSR keyboard events (fixes issue #2892 )

Update to Chromium version 80.0.3987.163
Linux: Fix CefPrintHandler callbacks from PDF viewer (fixes issue #2906 )
2025-06-05 21:39:12 +02:00 · 2020-04-08 11:47:26 -04:00 · 2020-04-03 14:18:21 -04:00 · 2020-04-02 17:38:37 -04:00 · 2020-04-02 17:38:29 -04:00 · 2020-04-02 17:38:21 -04:00
1313 changed files with 18445 additions and 31503 deletions
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,8 +1,6 @@
-# This file is an addendum to the Chromium AUTHORS file. It lists authors
-# through March 16, 2015 when Git was introduced for source code management.
-# A list of additional authors added after that date can be found by executing
-# this command on a local Git checkout:
-# git log --all --format="%aN <%aE>" | sort -u
+# This file is an addendum to the Chromium AUTHORS file.
+# Names should be added to this file like so:
+# Name or Organization <email address>

 Marshall Greenblatt <magreenblatt@gmail.com>
 Jamie Kirkpatrick <jkp@spotify.com>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -106,7 +106,6 @@ import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
-import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 import("//tools/grit/repack.gni")
@@ -122,8 +121,8 @@ if (is_linux) {
  import("//third_party/fontconfig/fontconfig.gni")
 }
 if (is_mac) {
-  import("//build/apple/tweak_info_plist.gni")
  import("//build/config/mac/rules.gni")
+  import("//build/mac/tweak_info_plist.gni")
  import("//build/util/version.gni")
  import("//media/cdm/library_cdm/cdm_paths.gni")
  import("//build/config/mac/base_rules.gni")
@@ -254,6 +253,7 @@ if (is_linux) {
 # Set ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1.
 assert(enable_basic_printing)
 assert(enable_print_preview)
+assert(!enable_service_discovery)

 # Enable support for Widevine CDM.
 assert(enable_widevine)
@@ -263,6 +263,12 @@ if (is_clang) {
  assert(!clang_use_chrome_plugins)
 }

+if (is_linux) {
+  # Use system fontconfig. This avoids a startup hang on Ubuntu 16.04.4 (see
+  # issue #2424).
+  assert(!use_bundled_fontconfig)
+}
+
 if (is_mac) {
  # Always generate dSYM files. The make_distrib script will fail if
  # enable_dsyms=true is not explicitly set when is_official_build=false.
@@ -297,10 +303,6 @@ gypi_paths2 = exec_script("//cef/tools/gypi_to_gn.py",
                          "scope",
                          [ "cef_paths2.gypi" ])

-includes_common = gypi_paths2.includes_common + gypi_paths2.includes_common_capi
-includes_mac = gypi_paths2.includes_mac + gypi_paths2.includes_mac_capi
-includes_linux = gypi_paths2.includes_linux + gypi_paths2.includes_linux_capi
-includes_win = gypi_paths2.includes_win + gypi_paths2.includes_win_capi

 #
 # Targets that will be built when depending on "//cef".
@@ -311,7 +313,6 @@ group("cef") {
  deps = [
    ":cefsimple",
    ":ceftests",
-    ":libcef_static_unittests",
  ]

  if (!is_linux || use_x11) {
@@ -369,77 +370,21 @@ if (is_win) {
  }
 }

-# libcef_static source files that have unit tests.
-source_set("libcef_static_unittested") {
-  sources = [
-    "libcef/browser/devtools/devtools_util.cc",
-    "libcef/browser/devtools/devtools_util.h",
-  ]
-
-  deps = [
-    "//base",
-  ]
-
-  configs += [
-    "libcef/features:config",
-    "//build/config:precompiled_headers",
-  ]
-}
-
-# Executable target for libcef_static unit tests.
-test("libcef_static_unittests") {
-  sources = [
-    "libcef/browser/devtools/devtools_util_unittest.cc",
-  ]
-
-  deps = [
-    ":libcef_static_unittested",
-    "//base/test:run_all_unittests",
-    "//testing/gtest",
-  ]
-
-  configs += [
-    "libcef/features:config",
-    "//build/config:precompiled_headers",
-  ]
-}
-
 static_library("libcef_static") {
-  sources = includes_common +
+  sources = gypi_paths2.includes_common +
            gypi_paths.autogen_cpp_includes + [
-    "libcef/browser/alloy/alloy_browser_context.cc",
-    "libcef/browser/alloy/alloy_browser_context.h",
-    "libcef/browser/alloy/alloy_browser_host_impl.cc",
-    "libcef/browser/alloy/alloy_browser_host_impl.h",
-    "libcef/browser/alloy/alloy_browser_main.cc",
-    "libcef/browser/alloy/alloy_browser_main.h",
-    "libcef/browser/alloy/browser_platform_delegate_alloy.cc",
-    "libcef/browser/alloy/browser_platform_delegate_alloy.h",
-    "libcef/browser/alloy/chrome_browser_process_alloy.cc",
-    "libcef/browser/alloy/chrome_browser_process_alloy.h",
-    "libcef/browser/alloy/chrome_profile_manager_alloy.cc",
-    "libcef/browser/alloy/chrome_profile_manager_alloy.h",
-    "libcef/browser/alloy/chrome_profile_alloy.cc",
-    "libcef/browser/alloy/chrome_profile_alloy.h",
-    "libcef/browser/alloy/alloy_content_browser_client.cc",
-    "libcef/browser/alloy/alloy_content_browser_client.h",
-    "libcef/browser/audio_capturer.cc",
-    "libcef/browser/audio_capturer.h",
-    "libcef/browser/audio_loopback_stream_creator.cc",
-    "libcef/browser/audio_loopback_stream_creator.h",
-    "libcef/browser/browser_contents_delegate.cc",
-    "libcef/browser/browser_contents_delegate.h",
    "libcef/browser/browser_context.cc",
    "libcef/browser/browser_context.h",
    "libcef/browser/browser_context_keyed_service_factories.cc",
    "libcef/browser/browser_context_keyed_service_factories.h",
-    "libcef/browser/browser_host_base.cc",
-    "libcef/browser/browser_host_base.h",
-    "libcef/browser/browser_host_create.cc",
+    "libcef/browser/browser_host_impl.cc",
+    "libcef/browser/browser_host_impl.h",
    "libcef/browser/browser_info.cc",
    "libcef/browser/browser_info.h",
    "libcef/browser/browser_info_manager.cc",
    "libcef/browser/browser_info_manager.h",
+    "libcef/browser/browser_main.cc",
+    "libcef/browser/browser_main.h",
    "libcef/browser/browser_message_filter.cc",
    "libcef/browser/browser_message_filter.h",
    "libcef/browser/browser_message_loop.cc",
@@ -449,32 +394,23 @@ static_library("libcef_static") {
    "libcef/browser/browser_platform_delegate_create.cc",
    "libcef/browser/browser_util.cc",
    "libcef/browser/browser_util.h",
-    "libcef/browser/chrome/browser_delegate.h",
-    "libcef/browser/chrome/browser_platform_delegate_chrome.cc",
-    "libcef/browser/chrome/browser_platform_delegate_chrome.h",
-    "libcef/browser/chrome/chrome_browser_context.cc",
-    "libcef/browser/chrome/chrome_browser_context.h",
-    "libcef/browser/chrome/chrome_browser_delegate.cc",
-    "libcef/browser/chrome/chrome_browser_delegate.h",
-    "libcef/browser/chrome/chrome_browser_host_impl.cc",
-    "libcef/browser/chrome/chrome_browser_host_impl.h",
-    "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc",
-    "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h",
-    "libcef/browser/chrome/chrome_content_browser_client_cef.cc",
-    "libcef/browser/chrome/chrome_content_browser_client_cef.h",
+    "libcef/browser/chrome_browser_process_stub.cc",
+    "libcef/browser/chrome_browser_process_stub.h",
    "libcef/browser/chrome_crash_reporter_client_stub.cc",
+    "libcef/browser/chrome_profile_manager_stub.cc",
+    "libcef/browser/chrome_profile_manager_stub.h",
+    "libcef/browser/chrome_profile_stub.cc",
+    "libcef/browser/chrome_profile_stub.h",
+    "libcef/browser/content_browser_client.cc",
+    "libcef/browser/content_browser_client.h",
    "libcef/browser/context.cc",
    "libcef/browser/context.h",
    "libcef/browser/context_menu_params_impl.cc",
    "libcef/browser/context_menu_params_impl.h",
-    "libcef/browser/devtools/devtools_controller.cc",
-    "libcef/browser/devtools/devtools_controller.h",
    "libcef/browser/devtools/devtools_file_manager.cc",
    "libcef/browser/devtools/devtools_file_manager.h",
    "libcef/browser/devtools/devtools_frontend.cc",
    "libcef/browser/devtools/devtools_frontend.h",
-    "libcef/browser/devtools/devtools_manager.cc",
-    "libcef/browser/devtools/devtools_manager.h",
    "libcef/browser/devtools/devtools_manager_delegate.cc",
    "libcef/browser/devtools/devtools_manager_delegate.h",
    "libcef/browser/download_item_impl.cc",
@@ -532,13 +468,9 @@ static_library("libcef_static") {
    "libcef/browser/frame_host_impl.h",
    "libcef/browser/image_impl.cc",
    "libcef/browser/image_impl.h",
-    "libcef/browser/iothread_state.cc",
-    "libcef/browser/iothread_state.h",
    "libcef/browser/javascript_dialog_runner.h",
    "libcef/browser/javascript_dialog_manager.cc",
    "libcef/browser/javascript_dialog_manager.h",
-    "libcef/browser/main_runner.cc",
-    "libcef/browser/main_runner.h",
    "libcef/browser/media_capture_devices_dispatcher.cc",
    "libcef/browser/media_capture_devices_dispatcher.h",
    "libcef/browser/media_router/media_route_impl.cc",
@@ -558,8 +490,6 @@ static_library("libcef_static") {
    "libcef/browser/menu_runner.h",
    "libcef/browser/native/browser_platform_delegate_native.cc",
    "libcef/browser/native/browser_platform_delegate_native.h",
-    "libcef/browser/native/cursor_util.h",
-    "libcef/browser/native/cursor_util.cc",
    "libcef/browser/navigate_params.cc",
    "libcef/browser/navigate_params.h",
    "libcef/browser/navigation_entry_impl.cc",
@@ -573,8 +503,6 @@ static_library("libcef_static") {
    "libcef/browser/net/internal_scheme_handler.h",
    "libcef/browser/net/scheme_handler.cc",
    "libcef/browser/net/scheme_handler.h",
-    "libcef/browser/net/throttle_handler.cc",
-    "libcef/browser/net/throttle_handler.h",
    "libcef/browser/net_service/browser_urlrequest_impl.cc",
    "libcef/browser/net_service/browser_urlrequest_impl.h",
    "libcef/browser/net_service/cookie_helper.cc",
@@ -633,6 +561,8 @@ static_library("libcef_static") {
    "libcef/browser/printing/print_view_manager.cc",
    "libcef/browser/printing/print_view_manager.h",
    "libcef/browser/process_util_impl.cc",
+    "libcef/browser/resource_context.cc",
+    "libcef/browser/resource_context.h",
    "libcef/browser/request_context_handler_map.cc",
    "libcef/browser/request_context_handler_map.h",
    "libcef/browser/request_context_impl.cc",
@@ -666,14 +596,6 @@ static_library("libcef_static") {
    "libcef/browser/xml_reader_impl.h",
    "libcef/browser/zip_reader_impl.cc",
    "libcef/browser/zip_reader_impl.h",
-    "libcef/common/alloy/alloy_content_client.cc",
-    "libcef/common/alloy/alloy_content_client.h",
-    "libcef/common/alloy/alloy_main_delegate.cc",
-    "libcef/common/alloy/alloy_main_delegate.h",
-    "libcef/common/alloy/alloy_main_runner_delegate.cc",
-    "libcef/common/alloy/alloy_main_runner_delegate.h",
-    "libcef/common/app_manager.cc",
-    "libcef/common/app_manager.h",
    "libcef/common/base_impl.cc",
    "libcef/common/cef_message_generator.cc",
    "libcef/common/cef_message_generator.h",
@@ -681,14 +603,10 @@ static_library("libcef_static") {
    "libcef/common/cef_messages.h",
    "libcef/common/cef_switches.cc",
    "libcef/common/cef_switches.h",
-    "libcef/common/chrome/chrome_content_client_cef.cc",
-    "libcef/common/chrome/chrome_content_client_cef.h",
-    "libcef/common/chrome/chrome_main_delegate_cef.cc",
-    "libcef/common/chrome/chrome_main_delegate_cef.h",
-    "libcef/common/chrome/chrome_main_runner_delegate.cc",
-    "libcef/common/chrome/chrome_main_runner_delegate.h",
    "libcef/common/command_line_impl.cc",
    "libcef/common/command_line_impl.h",
+    "libcef/common/content_client.cc",
+    "libcef/common/content_client.h",
    "libcef/common/crash_reporter_client.cc",
    "libcef/common/crash_reporter_client.h",
    "libcef/common/crash_reporting.cc",
@@ -707,8 +625,8 @@ static_library("libcef_static") {
    "libcef/common/frame_util.cc",
    "libcef/common/frame_util.h",
    "libcef/common/json_impl.cc",
-    "libcef/common/main_runner_delegate.h",
-    "libcef/common/main_runner_handler.h",
+    "libcef/common/main_delegate.cc",
+    "libcef/common/main_delegate.h",
    "libcef/common/net/http_header_utils.cc",
    "libcef/common/net/http_header_utils.h",
    "libcef/common/net/net_resource_provider.cc",
@@ -730,8 +648,6 @@ static_library("libcef_static") {
    "libcef/common/resource_bundle_delegate.h",
    "libcef/common/resource_bundle_impl.cc",
    "libcef/common/resource_bundle_impl.h",
-    "libcef/common/resource_util.cc",
-    "libcef/common/resource_util.h",
    "libcef/common/response_impl.cc",
    "libcef/common/response_impl.h",
    "libcef/common/response_manager.cc",
@@ -745,8 +661,6 @@ static_library("libcef_static") {
    "libcef/common/task_impl.cc",
    "libcef/common/task_runner_impl.cc",
    "libcef/common/task_runner_impl.h",
-    "libcef/common/task_runner_manager.cc",
-    "libcef/common/task_runner_manager.h",
    "libcef/common/test/translator_test_impl.cc",
    "libcef/common/thread_impl.cc",
    "libcef/common/thread_impl.h",
@@ -763,22 +677,10 @@ static_library("libcef_static") {
    "libcef/common/waitable_event_impl.h",
    "libcef/common/widevine_loader.cc",
    "libcef/common/widevine_loader.h",
-    "libcef/features/runtime.h",
-    "libcef/features/runtime_checks.h",
-    "libcef/renderer/alloy/alloy_content_renderer_client.cc",
-    "libcef/renderer/alloy/alloy_content_renderer_client.h",
-    "libcef/renderer/alloy/alloy_render_frame_observer.cc",
-    "libcef/renderer/alloy/alloy_render_frame_observer.h",
-    "libcef/renderer/alloy/alloy_render_thread_observer.cc",
-    "libcef/renderer/alloy/alloy_render_thread_observer.h",
-    "libcef/renderer/alloy/url_loader_throttle_provider_impl.cc",
-    "libcef/renderer/alloy/url_loader_throttle_provider_impl.h",
    "libcef/renderer/browser_impl.cc",
    "libcef/renderer/browser_impl.h",
-    "libcef/renderer/browser_manager.cc",
-    "libcef/renderer/browser_manager.h",
-    "libcef/renderer/chrome/chrome_content_renderer_client_cef.cc",
-    "libcef/renderer/chrome/chrome_content_renderer_client_cef.h",
+    "libcef/renderer/content_renderer_client.cc",
+    "libcef/renderer/content_renderer_client.h",
    "libcef/renderer/dom_document_impl.cc",
    "libcef/renderer/dom_document_impl.h",
    "libcef/renderer/dom_node_impl.cc",
@@ -800,12 +702,21 @@ static_library("libcef_static") {
    "libcef/renderer/render_urlrequest_impl.cc",
    "libcef/renderer/render_urlrequest_impl.h",
    "libcef/renderer/thread_util.h",
+    "libcef/renderer/url_loader_throttle_provider_impl.cc",
+    "libcef/renderer/url_loader_throttle_provider_impl.h",
    "libcef/renderer/v8_impl.cc",
    "libcef/renderer/v8_impl.h",

-    # For Chrome runtime support.
-    "//chrome/app/chrome_main_delegate.cc",
-    "//chrome/app/chrome_main_delegate.h",
+    "//chrome/browser/local_discovery/service_discovery_device_lister.cc",
+    "//chrome/browser/local_discovery/service_discovery_device_lister.h",
+    "//chrome/browser/local_discovery/service_discovery_client_impl.cc",
+    "//chrome/browser/local_discovery/service_discovery_client_impl.h",
+    "//chrome/browser/local_discovery/service_discovery_client.cc",
+    "//chrome/browser/local_discovery/service_discovery_client.h",
+    "//chrome/browser/local_discovery/service_discovery_client_mdns.cc",
+    "//chrome/browser/local_discovery/service_discovery_client_mdns.h",
+    "//chrome/browser/local_discovery/service_discovery_shared_client.cc",
+    "//chrome/browser/local_discovery/service_discovery_shared_client.h",    
  ]

  configs += [
@@ -832,8 +743,7 @@ static_library("libcef_static") {

  deps = [
    ":cef_make_headers",
-
-    ":libcef_static_unittested",
+    ":cef_service_manifests",

    # Generate API bindings for extensions.
    # TODO(cef): Enable if/when CEF exposes its own Mojo APIs. See
@@ -847,13 +757,12 @@ static_library("libcef_static") {
    "//base:base_static",
    "//base/third_party/dynamic_annotations",
    "//cc",
-    "//chrome:browser_dependencies",
-    "//chrome:child_dependencies",
-    "//chrome:packed_resources",
-    "//chrome:resources",
-    "//chrome:strings",
-    "//chrome/common:buildflags",
+    "//chrome/browser",
+    "//chrome/child",
+    "//chrome/common",
+    "//chrome/renderer",
    "//chrome/services/printing:lib",
+    "//chrome/utility",
    "//components/cdm/renderer",
    "//components/certificate_transparency",
    "//components/content_settings/core/browser",
@@ -863,9 +772,8 @@ static_library("libcef_static") {
    "//components/google/core/common",
    "//components/keyed_service/content:content",
    "//components/keyed_service/core:core",
-    "//components/media_router/common/mojom:media_router",
    "//components/navigation_interception",
-    "//components/network_session_configurator/common",
+    "//components/network_session_configurator/browser",
    "//components/pdf/browser",
    "//components/pdf/renderer",
    "//components/plugins/renderer",
@@ -874,9 +782,10 @@ static_library("libcef_static") {
    "//components/printing/common",
    "//components/printing/renderer",
    "//components/proxy_config",
-    "//components/safe_browsing/core/db:test_database_manager",
-    "//components/services/print_compositor/public/cpp",
-    "//components/services/print_compositor/public/mojom",
+    "//components/safe_browsing/db:test_database_manager",
+    "//components/services/pdf_compositor/public/cpp",
+    "//components/services/pdf_compositor/public/mojom",
+    "//components/tracing",
    "//components/update_client",
    "//components/url_formatter",
    "//components/user_prefs",
@@ -886,7 +795,7 @@ static_library("libcef_static") {
    "//components/visitedlink/renderer",
    "//components/viz/service",
    "//components/web_cache/renderer",
-    "//content/public/app",
+    "//content/public/app:both",
    "//content/public/browser",
    "//content/public/child",
    "//content/public/common",
@@ -911,6 +820,7 @@ static_library("libcef_static") {
    "//printing/buildflags",
    "//services/network:network_service",
    "//services/network/public/cpp",
+    "//services/service_manager/embedder",
    "//services/service_manager/public/cpp",
    "//skia",
    "//storage/browser",
@@ -938,11 +848,10 @@ static_library("libcef_static") {
  ]

  if (is_win) {
-    sources += includes_win + [
-      "libcef/browser/alloy/alloy_browser_main_win.cc",
+    sources += gypi_paths2.includes_win + [
+      "libcef/browser/browser_main_win.cc",
      "libcef/browser/native/browser_platform_delegate_native_win.cc",
      "libcef/browser/native/browser_platform_delegate_native_win.h",
-      "libcef/browser/native/cursor_util_win.cc",
      "libcef/browser/native/file_dialog_runner_win.cc",
      "libcef/browser/native/file_dialog_runner_win.h",
      "libcef/browser/native/javascript_dialog_runner_win.cc",
@@ -956,6 +865,7 @@ static_library("libcef_static") {
      "libcef/browser/native/native_menu_win.h",
      "libcef/browser/osr/browser_platform_delegate_osr_win.cc",
      "libcef/browser/osr/browser_platform_delegate_osr_win.h",
+      "libcef/browser/osr/render_widget_host_view_osr_win.cc",

      # Part of //chrome/utility.
      "//chrome/utility/printing_handler.cc",
@@ -983,14 +893,14 @@ static_library("libcef_static") {
  }

  if (is_linux) {
-    sources += includes_linux + [
+    sources += gypi_paths2.includes_linux + [
      "libcef/browser/native/browser_platform_delegate_native_linux.cc",
      "libcef/browser/native/browser_platform_delegate_native_linux.h",
-      "libcef/browser/native/cursor_util_linux.cc",
      "libcef/browser/native/menu_runner_linux.cc",
      "libcef/browser/native/menu_runner_linux.h",
      "libcef/browser/osr/browser_platform_delegate_osr_linux.cc",
      "libcef/browser/osr/browser_platform_delegate_osr_linux.h",
+      "libcef/browser/osr/render_widget_host_view_osr_linux.cc",
      "libcef/browser/printing/print_dialog_linux.cc",
      "libcef/browser/printing/print_dialog_linux.h",
    ]
@@ -1015,7 +925,7 @@ static_library("libcef_static") {
  }

  if (is_mac) {
-    sources += includes_mac + [
+    sources += gypi_paths2.includes_mac + [
      "libcef/browser/native/browser_platform_delegate_native_mac.h",
      "libcef/browser/native/browser_platform_delegate_native_mac.mm",
      "libcef/browser/native/file_dialog_runner_mac.h",
@@ -1028,10 +938,6 @@ static_library("libcef_static") {
      "libcef/browser/osr/browser_platform_delegate_osr_mac.mm",
      "libcef/common/util_mac.h",
      "libcef/common/util_mac.mm",
-
-      # For Chrome runtime support.
-      "//chrome/app/chrome_main_mac.h",
-      "//chrome/app/chrome_main_mac.mm",
    ]
  }

@@ -1050,7 +956,7 @@ static_library("libcef_static") {
    ]

    deps += [
-      "//components/crash/core/app",
+      "//components/crash/content/app",
      "//components/crash/content/browser",
    ]
  }
@@ -1182,17 +1088,16 @@ static_library("libcef_static") {
        "//ui/aura/test/aura_test_utils.cc",
        "//ui/aura/test/aura_test_utils.h",
        # Part of //ui/events:test_support which is testingonly.
-        "//ui/events/test/x11_event_waiter.cc",
-        "//ui/events/test/x11_event_waiter.h",
+        "//ui/events/test/platform_event_waiter.cc",
+        "//ui/events/test/platform_event_waiter.h",
      ]

      if (use_x11) {
        sources += [
          # Support for UI input events.
-          # Part of //ui/base/x:test_support which is testingonly.
-          "//ui/base/x/test/x11_ui_controls_test_helper.cc",
-          "//ui/base/x/test/x11_ui_controls_test_helper.h",
          # Part of //ui/aura:test_support which is testingonly.
+          "//ui/aura/test/ui_controls_factory_aurax11.cc",
+          "//ui/aura/test/x11_event_sender.cc",
          "//ui/aura/test/x11_event_sender.h",
          # Part of //ui/views:test_support which is testingonly.
          "//ui/views/test/ui_controls_factory_desktop_aurax11.cc",
@@ -1234,7 +1139,7 @@ config("libcef_dll_wrapper_config") {

 # libcef_dll_wrapper target.
 static_library("libcef_dll_wrapper") {
-  sources = includes_common +
+  sources = gypi_paths2.includes_common +
            gypi_paths.autogen_cpp_includes +
            gypi_paths2.includes_capi +
            gypi_paths.autogen_capi_includes +
@@ -1263,7 +1168,7 @@ if (is_win) {
    sources = [ "libcef_dll/sandbox/sandbox_win.cc" ]
    # CEF sources use include paths relative to the CEF root directory.
    include_dirs = [ "." ]
-    deps = [ "libcef/features", "//sandbox" ]
+    deps = [ "//sandbox" ]
  }
 }

@@ -1272,13 +1177,61 @@ if (is_mac) {
    sources = [ "libcef_dll/sandbox/sandbox_mac.mm" ]
    # CEF sources use include paths relative to the CEF root directory.
    include_dirs = [ "." ]
-    deps = [
-      "//build/config:executable_deps",
-      "//sandbox/mac:seatbelt"
-    ]
+    deps = [ "//sandbox/mac:seatbelt" ]
  }
 }

+#
+# Service manifests.
+#
+
+source_set("cef_content_browser_overlay_manifest") {
+  sources = [
+    "libcef/common/service_manifests/cef_content_browser_overlay_manifest.cc",
+    "libcef/common/service_manifests/cef_content_browser_overlay_manifest.h",
+  ]
+
+  configs += [
+    "libcef/features:config"
+  ]
+
+  deps = [
+    "//base",
+    "//chrome/common:mojo_bindings",
+    "//extensions/buildflags",
+    "//extensions/common:mojom",
+    "//extensions/common/api:mojom",
+    "//services/service_manager/public/cpp",
+    "//third_party/blink/public/common",
+  ]
+}
+
+source_set("cef_content_renderer_overlay_manifest") {
+  sources = [
+    "libcef/common/service_manifests/cef_content_renderer_overlay_manifest.h",
+  ]
+
+  configs += [
+    "libcef/features:config"
+  ]
+
+  deps = [
+    "//base",
+    "//components/subresource_filter/content/mojom",
+    "//extensions/buildflags",
+    "//extensions/common:mojom",
+    "//services/service_manager/public/cpp",
+    "//third_party/blink/public/common",
+  ]
+}
+
+source_set("cef_service_manifests") {
+  public_deps = [
+    ":cef_content_browser_overlay_manifest",
+    ":cef_content_renderer_overlay_manifest",
+  ]
+}
+
 #
 # Resource grit/pack targets.
 #
@@ -1347,15 +1300,13 @@ repack("pak_devtools") {
  # Add associated .h files in the make_pack_header("resources") target.
  sources = [
    "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
-    "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
  ]

  # Use public_deps so that generated grit headers are discoverable from
  # the libcef_static target. Grit deps that generate .cc files must be
  # listed both here and in the libcef_static target.
  public_deps = [
-    "//content/browser/devtools:devtools_resources",
-    "//third_party/blink/public:devtools_inspector_resources",
+    "//content/browser/devtools:resources",
  ]

  output = "$root_out_dir/devtools_resources.pak"
@@ -1372,7 +1323,6 @@ repack("pak_extensions") {
    "$root_gen_dir/extensions/extensions_renderer_resources.pak",
    "$root_gen_dir/extensions/extensions_resources.pak",
    "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
-    "$root_gen_dir/ui/resources/webui_generated_resources.pak",
    "$root_gen_dir/ui/resources/webui_resources.pak",
  ]

@@ -1386,7 +1336,6 @@ repack("pak_extensions") {
    "//extensions:extensions_renderer_resources",
    "//extensions:extensions_resources_grd",
    "//mojo/public/js:resources",
-    "//ui/resources:webui_generated_resources_grd",
    "//ui/resources:webui_resources_grd",
  ]

@@ -1438,18 +1387,14 @@ repack("pak") {
  # Each input pak file should also have a deps line for completeness.
  # Add associated .h files in the make_pack_header("resources") target.
  sources = [
-    "$root_gen_dir/base/tracing/protos/tracing_proto_resources.pak",
    "$root_gen_dir/chrome/browser_resources.pak",
-    "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
    "$root_gen_dir/chrome/net_internals_resources.pak",
    "$root_gen_dir/chrome/print_preview_resources.pak",
    "$root_gen_dir/chrome/common_resources.pak",
    "$root_gen_dir/components/components_resources.pak",
-    "$root_gen_dir/components/dev_ui_components_resources.pak",
    "$root_gen_dir/cef/cef_resources.pak",
    "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
    "$root_gen_dir/content/content_resources.pak",
-    "$root_gen_dir/content/dev_ui_content_resources.pak",
    "$root_gen_dir/net/net_resources.pak",
    "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
  ]
@@ -1458,18 +1403,14 @@ repack("pak") {
  # the libcef_static target. Grit deps that generate .cc files must be
  # listed both here and in the libcef_static target.
  public_deps = [
-    "//base/tracing/protos:chrome_track_event_resources",
-    "//chrome/browser:dev_ui_browser_resources",
    "//chrome/browser:resources",
    "//chrome/browser/resources/net_internals:net_internals_resources",
-    "//chrome/browser/resources/print_preview:print_preview_resources",
+    "//chrome/browser/resources:print_preview_resources",
    "//chrome/common:resources",
    "//components/resources:components_resources",
-    "//components/resources:dev_ui_components_resources",
    ":cef_resources",
    "//content/browser/tracing:resources",
-    "//content:content_resources",
-    "//content:dev_ui_content_resources",
+    "//content:resources",
    "//net:net_resources",
    "//third_party/blink/public:resources",
  ]
@@ -1508,28 +1449,22 @@ template("make_pack_header") {
 make_pack_header("resources") {
  header = "$root_out_dir/includes/include/cef_pack_resources.h"
  inputs = [
-    "$root_gen_dir/base/tracing/protos/grit/tracing_proto_resources.h",
    "$root_gen_dir/cef/grit/cef_resources.h",
    "$root_gen_dir/chrome/grit/browser_resources.h",
    "$root_gen_dir/chrome/grit/common_resources.h",
    "$root_gen_dir/chrome/grit/component_extension_resources.h",
-    "$root_gen_dir/chrome/grit/dev_ui_browser_resources.h",
    "$root_gen_dir/chrome/grit/net_internals_resources.h",
-    "$root_gen_dir/chrome/grit/print_preview_resources.h",
    "$root_gen_dir/chrome/grit/renderer_resources.h",
    "$root_gen_dir/components/grit/components_resources.h",
-    "$root_gen_dir/components/grit/dev_ui_components_resources.h",
    "$root_gen_dir/content/browser/devtools/grit/devtools_resources.h",
    "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
    "$root_gen_dir/content/grit/content_resources.h",
-    "$root_gen_dir/content/grit/dev_ui_content_resources.h",
    "$root_gen_dir/extensions/grit/extensions_browser_resources.h",
    "$root_gen_dir/extensions/grit/extensions_renderer_resources.h",
    "$root_gen_dir/extensions/grit/extensions_resources.h",
    "$root_gen_dir/net/grit/net_resources.h",
    "$root_gen_dir/third_party/blink/public/resources/grit/blink_resources.h",
    "$root_gen_dir/ui/resources/grit/ui_resources.h",
-    "$root_gen_dir/ui/resources/grit/webui_generated_resources.h",
    "$root_gen_dir/ui/resources/grit/webui_resources.h",
    "$root_gen_dir/ui/views/resources/grit/views_resources.h",
  ]
@@ -1544,8 +1479,6 @@ make_pack_header("strings") {
    "$root_gen_dir/chrome/grit/generated_resources.h",
    "$root_gen_dir/chrome/grit/locale_settings.h",
    "$root_gen_dir/chrome/grit/platform_locale_settings.h",
-    "$root_gen_dir/components/omnibox/resources/grit/omnibox_resources.h",
-    "$root_gen_dir/components/strings/grit/components_chromium_strings.h",
    "$root_gen_dir/components/strings/grit/components_strings.h",
    "$root_gen_dir/extensions/strings/grit/extensions_strings.h",
    "$root_gen_dir/services/strings/grit/services_strings.h",
@@ -1554,29 +1487,11 @@ make_pack_header("strings") {
  ]
 }

-# Generate cef_api_hash.h.
-action("make_api_hash_header") {
-  script = "tools/make_api_hash_header.py"
-
-  # List of all C API files that will be checked for changes by cef_api_hash.py.
-  inputs = gypi_paths2.includes_common_capi +
-           gypi_paths2.includes_linux_capi +
-           gypi_paths2.includes_mac_capi +
-           gypi_paths2.includes_win_capi +
-           gypi_paths2.includes_capi +
-           gypi_paths.autogen_capi_includes
-  include_dir = [ "include" ]
-  outputs = [ "$root_out_dir/includes/include/cef_api_hash.h" ]
-
-  args = rebase_path(outputs + include_dir, root_build_dir)
-}
-
 # Generate pack files and associated CEF header files.
 group("cef_make_headers") {
  deps = [
    ":make_pack_header_resources",
    ":make_pack_header_strings",
-    ":make_api_hash_header",
  ]
 }

@@ -1644,7 +1559,7 @@ if (is_mac) {
      ]
      public_deps += [ "//v8" ]
      if (use_v8_context_snapshot) {
-        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
+        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
        public_deps += [ "//tools/v8_context_snapshot" ]
      }
    }
@@ -1674,15 +1589,12 @@ if (is_mac) {
      sources = [
        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
-        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
-        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
      ]
      outputs = [
        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
      ]
      public_deps = [
-        "//ui/gl:swiftshader_egl_library_copy",
-        "//ui/gl:swiftshader_vk_library_copy",
+        "//ui/gl:swiftshader_library_copy",
      ]
    }
  }
@@ -1712,14 +1624,18 @@ if (is_mac) {
      "Resources",
    ]

-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_common +
+              gypi_paths2.includes_mac +
              gypi_paths.autogen_cpp_includes +
              gypi_paths2.includes_capi +
              gypi_paths.autogen_capi_includes +
              gypi_paths2.libcef_sources_common +
              gypi_paths.autogen_library_side

+    # TODO(rsesek): Handle these missing pieces:
+    #   - crash_inspector
+    #   - crash_report_sender.app
+
    deps = [
      ":cef_framework_angle_library",
      ":cef_framework_locales",
@@ -1752,7 +1668,7 @@ if (is_mac) {
  }
 } else {
  shared_library("libcef") {
-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths.autogen_cpp_includes +
              gypi_paths2.includes_capi +
              gypi_paths.autogen_capi_includes +
@@ -1764,10 +1680,15 @@ if (is_mac) {
    ]

    if (is_win) {
-      sources += includes_win + [
+      sources += gypi_paths2.includes_win + [
        "libcef_dll/libcef_dll.rc",
      ]

+      # This is a large module that can't do incremental linking in some cases.
+      configs -= [ "//build/config/win:default_incremental_linking" ]
+      configs +=
+          [ "//build/config/win:default_large_module_incremental_linking" ]
+
      deps += [ 
        # Bring in ui_unscaled_resources.rc which contains custom cursors.
        # TODO(cef): Remove this once custom cursors can be loaded via
@@ -1920,8 +1841,8 @@ if (is_mac) {
        deps += invoker.deps
      }

-      if (defined(invoker.frameworks)) {
-        frameworks = invoker.frameworks
+      if (defined(invoker.libs)) {
+        libs = invoker.libs
      }

      if (defined(invoker.defines)) {
@@ -1975,8 +1896,8 @@ if (is_mac) {

  cef_app("cefclient") {
    helper_info_plist = "tests/cefclient/resources/mac/helper-Info.plist"
-    helper_sources = includes_common +
-                     includes_mac +
+    helper_sources = gypi_paths2.includes_mac +
+                     gypi_paths2.includes_common +
                     gypi_paths2.includes_wrapper +
                     gypi_paths2.includes_wrapper_mac +
                     gypi_paths2.shared_sources_common +
@@ -1989,8 +1910,8 @@ if (is_mac) {
    ]

    info_plist = "tests/cefclient/resources/mac/Info.plist"
-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.includes_wrapper_mac +
              gypi_paths2.shared_sources_browser +
@@ -2005,7 +1926,7 @@ if (is_mac) {
      ":cefclient_resources_bundle_data_english",
      ":cefclient_xibs",
    ]
-    frameworks = [
+    libs = [
      "AppKit.framework",
      "OpenGL.framework",
    ]
@@ -2048,8 +1969,8 @@ if (is_mac) {

  cef_app("cefsimple") {
    helper_info_plist = "tests/cefsimple/mac/helper-Info.plist"
-    helper_sources = includes_common +
-                     includes_mac +
+    helper_sources = gypi_paths2.includes_mac +
+                     gypi_paths2.includes_common +
                     gypi_paths2.includes_wrapper +
                     gypi_paths2.includes_wrapper_mac +
                     gypi_paths2.cefsimple_sources_mac_helper
@@ -2058,8 +1979,8 @@ if (is_mac) {
    ]

    info_plist = "tests/cefsimple/mac/Info.plist"
-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.includes_wrapper_mac +
              gypi_paths2.cefsimple_sources_common +
@@ -2069,7 +1990,7 @@ if (is_mac) {
      ":cefsimple_resources_bundle_data_english",
      ":cefsimple_xibs",
    ]
-    frameworks = [
+    libs = [
      "AppKit.framework",
    ]
    defines = [
@@ -2125,8 +2046,8 @@ if (is_mac) {
    ]

    info_plist = "tests/ceftests/resources/mac/Info.plist"
-    sources = includes_common +
-              includes_mac +
+    sources = gypi_paths2.includes_mac +
+              gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.includes_wrapper_mac +
              gypi_paths2.shared_sources_browser +
@@ -2140,7 +2061,7 @@ if (is_mac) {
      ":ceftests_xibs",
      "//testing/gtest",
    ]
-    frameworks = [
+    libs = [
      "AppKit.framework",
    ]
    defines = [
@@ -2194,7 +2115,7 @@ if (is_mac) {
  }

  executable("cefclient") {
-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.shared_sources_browser +
              gypi_paths2.shared_sources_common +
@@ -2213,7 +2134,7 @@ if (is_mac) {
    ]

    if (is_win) {
-      sources += includes_win +
+      sources += gypi_paths2.includes_win +
                 gypi_paths2.shared_sources_win +
                 gypi_paths2.cefclient_sources_win

@@ -2248,7 +2169,7 @@ if (is_mac) {
    }

    if (is_linux) {
-      sources += includes_linux +
+      sources += gypi_paths2.includes_linux +
                 gypi_paths2.shared_sources_linux +
                 gypi_paths2.cefclient_sources_linux

@@ -2287,7 +2208,7 @@ if (is_mac) {
  #

  executable("cefsimple") {
-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.cefsimple_sources_common

@@ -2301,7 +2222,7 @@ if (is_mac) {
    ]

    if (is_win) {
-      sources += includes_win +
+      sources += gypi_paths2.includes_win +
                 gypi_paths2.cefsimple_sources_win

      # Set /SUBSYSTEM:WINDOWS.
@@ -2321,7 +2242,7 @@ if (is_mac) {
    }

    if (is_linux) {
-      sources += includes_linux +
+      sources += gypi_paths2.includes_linux +
                 gypi_paths2.cefsimple_sources_linux

      if (use_x11) {
@@ -2352,7 +2273,7 @@ if (is_mac) {
  executable("ceftests") {
    testonly = true

-    sources = includes_common +
+    sources = gypi_paths2.includes_common +
              gypi_paths2.includes_wrapper +
              gypi_paths2.shared_sources_browser +
              gypi_paths2.shared_sources_common +
--- 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/88.0.4324.182',
-  'depot_tools_checkout': '55e9ddf219'
+  'chromium_checkout': 'refs/tags/80.0.3987.163',
+  'depot_tools_checkout': 'ec2a6ce270'
 }
--- a/CHROMIUM_UPDATE.txt
+++ b/CHROMIUM_UPDATE.txt
@@ -27,6 +27,8 @@
  # Files in the chromium/src directory that should be evaluated for changes.
  # Similar changes may need to be applied to the CEF source code.
  'files': [
+    'chrome/app/chrome_*_manifest.*',
+    'chrome/app/chrome_*_manifests.*',
    'chrome/browser/browser_process.h',
    'chrome/browser/extensions/api/tabs/tabs_api.*',
    'chrome/browser/extensions/chrome_component_extension_resource_manager.*',
@@ -55,9 +57,7 @@
    'content/shell/renderer/shell_*',
    'content/shell/utility/shell_*',
    'extensions/shell/*',
-    'net/base/features.cc',
    'net/cookies/cookie_store.h',
-    'services/network/public/cpp/features.cc',
    'ui/base/ui_base_features.cc',
  ],
  # Patterns that should not be found in the chromium/src directory after
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -12,8 +12,8 @@
 # distribution include:
 #
 # Linux:      Ninja, Unix Makefiles
-# MacOS:      Ninja, Xcode 8+ (x86_64) or Xcode 12.2+ (ARM64)
-# Windows:    Ninja, Visual Studio 2015+
+# Mac OS X:   Ninja, Xcode 5+
+# Windows:    Ninja, Visual Studio 2010+
 #
 # Ninja is a cross-platform open-source tool for running fast builds using
 # pre-installed platform toolchains (GNU, clang, Xcode or MSVC). It can be
@@ -40,22 +40,21 @@
 #
 # - Linux requirements:
 #   Currently supported distributions include Debian Wheezy, Ubuntu Precise, and
-#   related. Ubuntu 18.04 64-bit is recommended. Newer versions will likely also
+#   related. Ubuntu 14.04 64-bit is recommended. Newer versions will likely also
 #   work but may not have been tested.
 #   Required packages include:
 #     build-essential
 #     libgtk2.0-dev     (required by the cefclient target only)
 #     libgtkglext1-dev  (required by the cefclient target only)
 #
-# - MacOS requirements:
-#   Xcode 8 or newer building on MacOS 10.11 (El Capitan) or newer for x86_64.
-#   Xcode 12.2 or newer building on MacOS 10.15.4 (Catalina) or newer for ARM64.
-#   Only 64-bit builds are supported. The Xcode command-line tools must also be
-#   installed.
+# - Mac OS X requirements:
+#   Xcode 5 or newer building on Mac OS X 10.9 (Mavericks) or newer. Xcode 8.3
+#   and OS X 10.12 are recommended. The Xcode command-line tools must also be
+#   installed. Only 64-bit builds are supported on OS X.
 #
 # - Windows requirements:
-#   Visual Studio 2015 Update 2 or newer building on Windows 7 or newer. Visual
-#   Studio 2019 and Windows 10 64-bit are recommended.
+#   Visual Studio 2010 or newer building on Windows 7 or newer. Visual Studio
+#   2015 Update 3 and Windows 10 64-bit are recommended.
 #
 # BUILD EXAMPLES
 #
@@ -76,7 +75,7 @@
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
-# To perform a MacOS build using a 64-bit CEF binary distribution:
+# To perform a Mac OS X build using a 64-bit CEF binary distribution:
 #   Using the Xcode IDE:
 #     > cmake -G "Xcode" -DPROJECT_ARCH="x86_64" ..
 #     Open build\cef.xcodeproj in Xcode and select Product > Build.
@@ -85,47 +84,27 @@
 #     > cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
-# To perform a MacOS build using an ARM64 CEF binary distribution:
-#   Using the Xcode IDE:
-#     > cmake -G "Xcode" -DPROJECT_ARCH="arm64" ..
-#     Open build\cef.xcodeproj in Xcode and select Product > Build.
-#
-#   Using Ninja:
-#     > cmake -G "Ninja" -DPROJECT_ARCH="arm64" -DCMAKE_BUILD_TYPE=Debug ..
-#     > ninja cefclient cefsimple
-#
 # To perform a Windows build using a 32-bit CEF binary distribution:
-#   Using the Visual Studio 2019 IDE:
-#     > cmake -G "Visual Studio 16" -A Win32 ..
+#   Using the Visual Studio 2015 IDE:
+#     > cmake -G "Visual Studio 14" ..
 #     Open build\cef.sln in Visual Studio and select Build > Build Solution.
 #
-#   Using Ninja with Visual Studio 2019 command-line tools:
+#   Using Ninja with Visual Studio 2015 command-line tools:
 #     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars32.bat"
+#     > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
 #
 # To perform a Windows build using a 64-bit CEF binary distribution:
-#   Using the Visual Studio 2019 IDE:
-#     > cmake -G "Visual Studio 16" -A x64 ..
+#   Using the Visual Studio 2015 IDE:
+#     > cmake -G "Visual Studio 14 Win64" ..
 #     Open build\cef.sln in Visual Studio and select Build > Build Solution.
 #
-#   Using Ninja with Visual Studio 2019 command-line tools:
+#   Using Ninja with Visual Studio 2015 command-line tools:
 #     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
+#     > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
 #     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
 #     > ninja cefclient cefsimple
-#
-# To perform a Windows build using an ARM64 CEF binary distribution:
-#   Using the Visual Studio 2019 IDE:
-#     > cmake -G "Visual Studio 16" -A arm64 ..
-#     Open build\cef.sln in Visual Studio and select Build > Build Solution.
-#
-#   Using Ninja with Visual Studio 2019 command-line tools:
-#     (this path may be different depending on your Visual Studio installation)
-#     > "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
-#     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
-#     > ninja cefsimple

 #
 # Global setup.
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The Chromium Embedded Framework (CEF) is a simple framework for embedding Chromi
 * Support Forum - http://www.magpcss.org/ceforum/
 * CEF1 C++ API Docs - http://magpcss.org/ceforum/apidocs/
 * CEF3 C++ API Docs - http://magpcss.org/ceforum/apidocs3/
-* Downloads - https://cef-builds.spotifycdn.com/index.html
+* Downloads - http://opensource.spotify.com/cefbuilds/index.html
 * Donations - http://www.magpcss.org/ceforum/donate.php

 # Introduction
@@ -33,7 +33,7 @@ Users new to CEF development should start by reading the [Tutorial](https://bitb

 # Binary Distributions

-Binary distributions, which include all files necessary to build a CEF-based application, are available on the [Downloads](https://cef-builds.spotifycdn.com/index.html) page. Binary distributions are stand-alone and do not require the download of CEF or Chromium source code. Symbol files for debugging binary distributions of libcef can also be downloaded from the above links.
+Binary distributions, which include all files necessary to build a CEF-based application, are available on the [Downloads](http://opensource.spotify.com/cefbuilds/index.html) page. Binary distributions are stand-alone and do not require the download of CEF or Chromium source code. Symbol files for debugging binary distributions of libcef can also be downloaded from the above links.

 # Source Distributions

--- a/cef_paths.gypi
+++ b/cef_paths.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 The Chromium Embedded Framework Authors. All rights
+# Copyright (c) 2020 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=f1877c7a493342351e284cb6c14e6f223461facb$
+# $hash=578c0aef11c3c7840679e480069fc9031c628e25$
 #

 {
@@ -16,7 +16,6 @@
    'autogen_cpp_includes': [
      'include/cef_accessibility_handler.h',
      'include/cef_app.h',
-      'include/cef_audio_handler.h',
      'include/cef_auth_callback.h',
      'include/cef_browser.h',
      'include/cef_browser_process_handler.h',
@@ -26,7 +25,6 @@
      'include/cef_context_menu_handler.h',
      'include/cef_cookie.h',
      'include/cef_crash_util.h',
-      'include/cef_devtools_message_observer.h',
      'include/cef_dialog_handler.h',
      'include/cef_display_handler.h',
      'include/cef_dom.h',
@@ -113,7 +111,6 @@
    'autogen_capi_includes': [
      'include/capi/cef_accessibility_handler_capi.h',
      'include/capi/cef_app_capi.h',
-      'include/capi/cef_audio_handler_capi.h',
      'include/capi/cef_auth_callback_capi.h',
      'include/capi/cef_browser_capi.h',
      'include/capi/cef_browser_process_handler_capi.h',
@@ -123,7 +120,6 @@
      'include/capi/cef_context_menu_handler_capi.h',
      'include/capi/cef_cookie_capi.h',
      'include/capi/cef_crash_util_capi.h',
-      'include/capi/cef_devtools_message_observer_capi.h',
      'include/capi/cef_dialog_handler_capi.h',
      'include/capi/cef_display_handler_capi.h',
      'include/capi/cef_dom_capi.h',
@@ -212,8 +208,6 @@
      'libcef_dll/ctocpp/accessibility_handler_ctocpp.h',
      'libcef_dll/ctocpp/app_ctocpp.cc',
      'libcef_dll/ctocpp/app_ctocpp.h',
-      'libcef_dll/ctocpp/audio_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/audio_handler_ctocpp.h',
      'libcef_dll/cpptoc/auth_callback_cpptoc.cc',
      'libcef_dll/cpptoc/auth_callback_cpptoc.h',
      'libcef_dll/cpptoc/before_download_callback_cpptoc.cc',
@@ -262,8 +256,6 @@
      'libcef_dll/ctocpp/domvisitor_ctocpp.h',
      'libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc',
      'libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h',
-      'libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc',
-      'libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h',
      'libcef_dll/ctocpp/dialog_handler_ctocpp.cc',
      'libcef_dll/ctocpp/dialog_handler_ctocpp.h',
      'libcef_dll/cpptoc/dictionary_value_cpptoc.cc',
@@ -330,8 +322,6 @@
      'libcef_dll/cpptoc/media_router_cpptoc.h',
      'libcef_dll/cpptoc/media_sink_cpptoc.cc',
      'libcef_dll/cpptoc/media_sink_cpptoc.h',
-      'libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h',
      'libcef_dll/cpptoc/media_source_cpptoc.cc',
      'libcef_dll/cpptoc/media_source_cpptoc.h',
      'libcef_dll/cpptoc/views/menu_button_cpptoc.cc',
@@ -522,8 +512,6 @@
      'libcef_dll/cpptoc/accessibility_handler_cpptoc.h',
      'libcef_dll/cpptoc/app_cpptoc.cc',
      'libcef_dll/cpptoc/app_cpptoc.h',
-      'libcef_dll/cpptoc/audio_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/audio_handler_cpptoc.h',
      'libcef_dll/ctocpp/auth_callback_ctocpp.cc',
      'libcef_dll/ctocpp/auth_callback_ctocpp.h',
      'libcef_dll/ctocpp/before_download_callback_ctocpp.cc',
@@ -572,8 +560,6 @@
      'libcef_dll/cpptoc/domvisitor_cpptoc.h',
      'libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc',
      'libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h',
-      'libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc',
-      'libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h',
      'libcef_dll/cpptoc/dialog_handler_cpptoc.cc',
      'libcef_dll/cpptoc/dialog_handler_cpptoc.h',
      'libcef_dll/ctocpp/dictionary_value_ctocpp.cc',
@@ -640,8 +626,6 @@
      'libcef_dll/ctocpp/media_router_ctocpp.h',
      'libcef_dll/ctocpp/media_sink_ctocpp.cc',
      'libcef_dll/ctocpp/media_sink_ctocpp.h',
-      'libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h',
      'libcef_dll/ctocpp/media_source_ctocpp.cc',
      'libcef_dll/ctocpp/media_source_ctocpp.h',
      'libcef_dll/ctocpp/views/menu_button_ctocpp.cc',
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -13,6 +13,7 @@
      'include/base/cef_build.h',
      'include/base/cef_callback.h',
      'include/base/cef_callback_forward.h',
+      'include/base/cef_callback_helpers.h',
      'include/base/cef_callback_list.h',
      'include/base/cef_cancelable_callback.h',
      'include/base/cef_lock.h',
@@ -38,21 +39,19 @@
      'include/cef_config.h',
      'include/cef_version.h',
      'include/internal/cef_export.h',
-      'include/internal/cef_ptr.h',
-      'include/internal/cef_string_wrappers.h',
-      'include/internal/cef_types_wrappers.h',
-    ],
-    'includes_common_capi': [
      'include/internal/cef_logging_internal.h',
+      'include/internal/cef_ptr.h',
      'include/internal/cef_string.h',
      'include/internal/cef_string_list.h',
      'include/internal/cef_string_map.h',
      'include/internal/cef_string_multimap.h',
      'include/internal/cef_string_types.h',
+      'include/internal/cef_string_wrappers.h',
      'include/internal/cef_thread_internal.h',
      'include/internal/cef_time.h',
      'include/internal/cef_trace_event_internal.h',
      'include/internal/cef_types.h',
+      'include/internal/cef_types_wrappers.h',
    ],
    'includes_capi': [
      'include/capi/cef_base_capi.h',
@@ -76,10 +75,8 @@
      'include/base/internal/cef_atomicops_x86_msvc.h',
      'include/base/internal/cef_bind_internal_win.h',
      'include/cef_sandbox_win.h',
-      'include/internal/cef_win.h',
-    ],
-    'includes_win_capi': [
      'include/internal/cef_types_win.h',
+      'include/internal/cef_win.h',
    ],
    'includes_mac': [
      'include/base/internal/cef_atomicops_atomicword_compat.h',
@@ -87,8 +84,6 @@
      'include/cef_application_mac.h',
      'include/cef_sandbox_mac.h',
      'include/internal/cef_mac.h',
-    ],
-    'includes_mac_capi': [
      'include/internal/cef_types_mac.h',
    ],
    'includes_linux': [
@@ -97,8 +92,6 @@
      'include/base/internal/cef_atomicops_arm64_gcc.h',
      'include/base/internal/cef_atomicops_x86_gcc.h',
      'include/internal/cef_linux.h',
-    ],
-    'includes_linux_capi': [
      'include/internal/cef_types_linux.h',
    ],
    'libcef_sources_common': [
@@ -123,6 +116,7 @@
    'libcef_dll_wrapper_sources_base': [
      'libcef_dll/base/cef_atomicops_x86_gcc.cc',
      'libcef_dll/base/cef_bind_helpers.cc',
+      'libcef_dll/base/cef_callback_helpers.cc',
      'libcef_dll/base/cef_callback_internal.cc',
      'libcef_dll/base/cef_lock.cc',
      'libcef_dll/base/cef_lock_impl.cc',
@@ -464,12 +458,9 @@
      'tests/cefsimple/simple_handler_linux.cc',
    ],
    'ceftests_sources_common': [
-      'tests/ceftests/audio_output_unittest.cc',
      'tests/ceftests/browser_info_map_unittest.cc',
      'tests/ceftests/command_line_unittest.cc',
      'tests/ceftests/cookie_unittest.cc',
-      'tests/ceftests/cors_unittest.cc',
-      'tests/ceftests/devtools_message_unittest.cc',
      'tests/ceftests/dialog_unittest.cc',
      'tests/ceftests/display_unittest.cc',
      'tests/ceftests/dom_unittest.cc',
@@ -519,11 +510,6 @@
      'tests/ceftests/task_unittest.cc',
      'tests/ceftests/test_handler.cc',
      'tests/ceftests/test_handler.h',
-      'tests/ceftests/test_request.cc',
-      'tests/ceftests/test_request.h',
-      'tests/ceftests/test_server.cc',
-      'tests/ceftests/test_server.h',
-      'tests/ceftests/test_server_unittest.cc',
      'tests/ceftests/test_suite.cc',
      'tests/ceftests/test_suite.h',
      'tests/ceftests/test_util.cc',
@@ -532,7 +518,6 @@
      'tests/ceftests/thread_helper.h',
      'tests/ceftests/thread_unittest.cc',
      'tests/ceftests/tracing_unittest.cc',
-      'tests/ceftests/track_callback.h',
      'tests/ceftests/translator_unittest.cc',
      'tests/ceftests/urlrequest_unittest.cc',
      'tests/ceftests/v8_unittest.cc',
@@ -572,7 +557,6 @@
      'tests/shared/browser/resource_util.h',
      'tests/shared/browser/resource_util_mac.mm',
      'tests/shared/browser/resource_util_posix.cc',
-      'tests/ceftests/audio_output_unittest.cc',
      'tests/ceftests/client_app_delegates.cc',
      'tests/ceftests/cookie_unittest.cc',
      'tests/ceftests/dom_unittest.cc',
@@ -592,15 +576,10 @@
      'tests/ceftests/urlrequest_unittest.cc',
      'tests/ceftests/test_handler.cc',
      'tests/ceftests/test_handler.h',
-      'tests/ceftests/test_request.cc',
-      'tests/ceftests/test_request.h',
-      'tests/ceftests/test_server.cc',
-      'tests/ceftests/test_server.h',
      'tests/ceftests/test_suite.cc',
      'tests/ceftests/test_suite.h',
      'tests/ceftests/test_util.cc',
      'tests/ceftests/test_util.h',
-      'tests/ceftests/track_callback.h',
      'tests/ceftests/thread_helper.cc',
      'tests/ceftests/thread_helper.h',
      'tests/ceftests/thread_unittest.cc',
--- a/cef_repack_locales.gni
+++ b/cef_repack_locales.gni
@@ -34,8 +34,6 @@ template("_repack_one_locale") {
      "${root_gen_dir}/chrome/generated_resources_${locale}.pak",
      "${root_gen_dir}/chrome/locale_settings_${locale}.pak",
      "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak",
-      "${root_gen_dir}/components/omnibox/resources/omnibox_resources_${locale}.pak",
-      "${root_gen_dir}/components/strings/components_chromium_strings_${locale}.pak",
      "${root_gen_dir}/components/strings/components_locale_settings_${locale}.pak",
      "${root_gen_dir}/components/strings/components_strings_${locale}.pak",
      "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
@@ -54,8 +52,6 @@ template("_repack_one_locale") {
      "//chrome/app:generated_resources",
      "//chrome/app/resources:locale_settings",
      "//chrome/app/resources:platform_locale_settings",
-      "//components/omnibox/resources:omnibox_resources",
-      "//components/strings:components_chromium_strings",
      "//components/strings:components_locale_settings",
      "//components/strings:components_strings",
      "//extensions/strings",
--- a/cmake/cef_macros.cmake.in
+++ b/cmake/cef_macros.cmake.in
@@ -25,7 +25,7 @@ macro(PRINT_CEF_CONFIG)

  message(STATUS "Binary distribution root:     ${_CEF_ROOT}")

-  if(OS_MAC)
+  if(OS_MACOSX)
    message(STATUS "Base SDK:                     ${CMAKE_OSX_SYSROOT}")
    message(STATUS "Target SDK:                   ${CEF_TARGET_SDK}")
  endif()
@@ -75,8 +75,8 @@ macro(APPEND_PLATFORM_SOURCES name_of_list)
  if(OS_WINDOWS AND ${name_of_list}_WINDOWS)
    list(APPEND ${name_of_list} ${${name_of_list}_WINDOWS})
  endif()
-  if(OS_MAC AND ${name_of_list}_MAC)
-    list(APPEND ${name_of_list} ${${name_of_list}_MAC})
+  if(OS_MACOSX AND ${name_of_list}_MACOSX)
+    list(APPEND ${name_of_list} ${${name_of_list}_MACOSX})
  endif()
 endmacro()

@@ -184,10 +184,10 @@ endif(OS_LINUX)
 # Mac OS X macros.
 #

-if(OS_MAC)
+if(OS_MACOSX)

 # Manually process and copy over resource files.
-macro(COPY_MAC_RESOURCES resource_list prefix_list target source_dir app_path)
+macro(COPY_MACOSX_RESOURCES resource_list prefix_list target source_dir app_path)
  foreach(FILENAME ${resource_list})
    # Remove one or more prefixes from the source paths.
    set(TARGET_FILENAME "${FILENAME}")
@@ -229,7 +229,7 @@ macro(COPY_MAC_RESOURCES resource_list prefix_list target source_dir app_path)
  endforeach()
 endmacro()

-endif(OS_MAC)
+endif(OS_MACOSX)


 #
@@ -298,7 +298,7 @@ macro(SET_COMMON_TARGET_PROPERTIES target)
    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
  endif()

-  if(OS_MAC)
+  if(OS_MACOSX)
    # Set Xcode target properties.
    set_target_properties(${target} PROPERTIES
      XCODE_ATTRIBUTE_ALWAYS_SEARCH_USER_PATHS                    NO
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -14,8 +14,7 @@ endif()

 # Determine the platform.
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-  set(OS_MAC 1)
-  set(OS_MACOSX 1)  # For backwards compatibility.
+  set(OS_MACOSX 1)
  set(OS_POSIX 1)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
  set(OS_LINUX 1)
@@ -26,15 +25,13 @@ endif()

 # Determine the project architecture.
 if(NOT DEFINED PROJECT_ARCH)
-  if(OS_WINDOWS AND "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64")
-    set(PROJECT_ARCH "arm64")
-  elseif(CMAKE_SIZEOF_VOID_P MATCHES 8)
+  if(CMAKE_SIZEOF_VOID_P MATCHES 8)
    set(PROJECT_ARCH "x86_64")
  else()
    set(PROJECT_ARCH "x86")
  endif()

-  if(OS_MAC)
+  if(OS_MACOSX)
    # PROJECT_ARCH should be specified on Mac OS X.
    message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
  endif()
@@ -249,7 +246,7 @@ endif()
 # Mac OS X configuration.
 #

-if(OS_MAC)
+if(OS_MACOSX)
  # Platform-specific compiler/linker flags.
  # See also Xcode target properties in cef_macros.cmake.
  set(CEF_LIBTYPE SHARED)
@@ -313,7 +310,7 @@ if(OS_MAC)

  # Find the newest available base SDK.
  execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-  foreach(OS_VERSION 10.15 10.14 10.13 10.12 10.11)
+  foreach(OS_VERSION 10.11 10.10 10.9)
    set(SDK "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OS_VERSION}.sdk")
    if(NOT "${CMAKE_OSX_SYSROOT}" AND EXISTS "${SDK}" AND IS_DIRECTORY "${SDK}")
      set(CMAKE_OSX_SYSROOT ${SDK})
@@ -321,7 +318,7 @@ if(OS_MAC)
  endforeach()

  # Target SDK.
-  set(CEF_TARGET_SDK               "10.11")
+  set(CEF_TARGET_SDK               "10.9")
  list(APPEND CEF_COMPILER_FLAGS
    -mmacosx-version-min=${CEF_TARGET_SDK}
  )
@@ -330,8 +327,6 @@ if(OS_MAC)
  # Target architecture.
  if(PROJECT_ARCH STREQUAL "x86_64")
    set(CMAKE_OSX_ARCHITECTURES "x86_64")
-  elseif(PROJECT_ARCH STREQUAL "arm64")
-    set(CMAKE_OSX_ARCHITECTURES "arm64")
  else()
    set(CMAKE_OSX_ARCHITECTURES "i386")
  endif()
@@ -380,8 +375,25 @@ if(OS_WINDOWS)

  if(USE_SANDBOX)
    # Check if the current MSVC version is compatible with the cef_sandbox.lib
-    # static library. We require VS2015 or newer.
-    if(MSVC_VERSION LESS 1900)
+    # static library. For a list of all version numbers see
+    # https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
+    list(APPEND supported_msvc_versions
+      1900  # VS2015 and updates 1, 2, & 3
+      1910  # VS2017 version 15.1 & 15.2
+      1911  # VS2017 version 15.3 & 15.4
+      1912  # VS2017 version 15.5
+      1913  # VS2017 version 15.6
+      1914  # VS2017 version 15.7
+      1915  # VS2017 version 15.8
+      1916  # VS2017 version 15.9
+      1920  # VS2019 version 16.0
+      1921  # VS2019 version 16.1
+      1922  # VS2019 version 16.2
+      1923  # VS2019 version 16.3
+      1924  # VS2019 version 16.4
+      )
+    list(FIND supported_msvc_versions ${MSVC_VERSION} _index)
+    if (${_index} EQUAL -1)
      message(WARNING "CEF sandbox is not compatible with the current MSVC version (${MSVC_VERSION})")
      set(USE_SANDBOX OFF)
    endif()
@@ -464,6 +476,7 @@ if(OS_WINDOWS)
  # List of CEF binary files.
  set(CEF_BINARY_FILES
    chrome_elf.dll
+    d3dcompiler_47.dll
    libcef.dll
    libEGL.dll
    libGLESv2.dll
@@ -472,12 +485,6 @@ if(OS_WINDOWS)
    swiftshader
    )

-  if(NOT PROJECT_ARCH STREQUAL "arm64")
-    list(APPEND CEF_BINARY_FILES
-      d3dcompiler_47.dll
-      )
-  endif()
-
  # List of CEF resource files.
  set(CEF_RESOURCE_FILES
    cef.pak
@@ -497,15 +504,12 @@ if(OS_WINDOWS)

    # Libraries required by cef_sandbox.lib.
    set(CEF_SANDBOX_STANDARD_LIBS
-      Advapi32.lib
      dbghelp.lib
      Delayimp.lib
-      OleAut32.lib
      PowrProf.lib
      Propsys.lib
      psapi.lib
      SetupAPI.lib
-      Shell32.lib
      version.lib
      wbemuuid.lib
      winmm.lib
--- a/include/base/cef_atomicops.h
+++ b/include/base/cef_atomicops.h
@@ -180,7 +180,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
 #include "include/base/internal/cef_atomicops_x86_msvc.h"
 #elif defined(OS_WIN) && (defined(__ARM_ARCH_ISA_A64) || defined(_M_ARM64))
 #include "include/base/internal/cef_atomicops_arm64_msvc.h"
-#elif defined(OS_MAC)
+#elif defined(OS_MACOSX)
 #include "include/base/internal/cef_atomicops_mac.h"
 #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
 #include "include/base/internal/cef_atomicops_x86_gcc.h"
@@ -194,7 +194,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);

 // On some platforms we need additional declarations to make
 // AtomicWord compatible with our other Atomic* types.
-#if defined(OS_MAC) || defined(OS_OPENBSD)
+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
 #include "include/base/internal/cef_atomicops_atomicword_compat.h"
 #endif

--- a/include/base/cef_basictypes.h
+++ b/include/base/cef_basictypes.h
@@ -42,7 +42,7 @@
 //
 // On Mac OS X, |long long| is used for 64-bit types for compatibility with
 // <inttypes.h> format macros even in the LP64 model.
-#if defined(__LP64__) && !defined(OS_MAC) && !defined(OS_OPENBSD)
+#if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
 typedef long int64;
 typedef unsigned long uint64;
 #else
--- a/include/base/cef_build.h
+++ b/include/base/cef_build.h
@@ -44,14 +44,6 @@
 #define OS_WIN 1
 #endif
 #elif defined(__APPLE__)
-// New platform defines after https://crbug.com/1105907.
-#ifndef OS_MAC
-#define OS_MAC 1
-#endif
-#ifndef OS_APPLE
-#define OS_APPLE 1
-#endif
-// Old platform defines retained for backwards compatibility.
 #ifndef OS_MACOSX
 #define OS_MACOSX 1
 #endif
@@ -65,7 +57,7 @@

 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
-#if defined(OS_MAC) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_LINUX)
 #ifndef OS_POSIX
 #define OS_POSIX 1
 #endif
--- a/include/base/cef_callback_helpers.h
+++ b/include/base/cef_callback_helpers.h
@@ -0,0 +1,93 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
+// Google Inc. 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 defines helpful methods for dealing with Callbacks.  Because Callbacks
+// are implemented using templates, with a class per callback signature, adding
+// methods to Callback<> itself is unattractive (lots of extra code gets
+// generated).  Instead, consider adding methods here.
+//
+// ResetAndReturn(&cb) is like cb.Reset() but allows executing a callback (via a
+// copy) after the original callback is Reset().  This can be handy if Run()
+// reads/writes the variable holding the Callback.
+
+#ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
+#define CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
+#pragma once
+
+#if defined(BASE_CALLBACK_HELPERS_H_)
+// Do nothing if the Chromium header has already been included.
+// This can happen in cases where Chromium code is used directly by the
+// client application. When using Chromium code directly always include
+// the Chromium header first to avoid type conflicts.
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/callback_helpers.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include "include/base/cef_basictypes.h"
+#include "include/base/cef_build.h"
+#include "include/base/cef_callback.h"
+#include "include/base/cef_macros.h"
+
+namespace base {
+
+template <typename Sig>
+base::Callback<Sig> ResetAndReturn(base::Callback<Sig>* cb) {
+  base::Callback<Sig> ret(*cb);
+  cb->Reset();
+  return ret;
+}
+
+// ScopedClosureRunner is akin to scoped_ptr for Closures. It ensures that the
+// Closure is executed and deleted no matter how the current scope exits.
+class ScopedClosureRunner {
+ public:
+  ScopedClosureRunner();
+  explicit ScopedClosureRunner(const Closure& closure);
+  ~ScopedClosureRunner();
+
+  void Reset();
+  void Reset(const Closure& closure);
+  Closure Release() WARN_UNUSED_RESULT;
+
+ private:
+  Closure closure_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedClosureRunner);
+};
+
+}  // namespace base
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
--- a/include/base/cef_logging.h
+++ b/include/base/cef_logging.h
@@ -136,11 +136,7 @@
 #define CEF_INCLUDE_BASE_CEF_LOGGING_H_
 #pragma once

-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/logging.h"
-#include "base/notreached.h"
-#elif defined(DCHECK)
+#if defined(DCHECK)
 // Do nothing if the macros provided by this header already exist.
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
@@ -153,7 +149,10 @@
 #define DCHECK_IS_ON() true
 #endif

-#else  // !defined(DCHECK)
+#elif defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/logging.h"
+#else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -554,7 +553,12 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
 #define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
 #define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2)

+#if defined(NDEBUG) && defined(OS_CHROMEOS)
+#define NOTREACHED() \
+  LOG(ERROR) << "NOTREACHED() hit in " << __FUNCTION__ << ". "
+#else
 #define NOTREACHED() DCHECK(false)
+#endif

 // Redefine the standard assert to use our nice log files
 #undef assert
--- a/include/base/cef_weak_ptr.h
+++ b/include/base/cef_weak_ptr.h
@@ -250,11 +250,11 @@ class WeakPtr : public cef_internal::WeakPtrBase {
  T* get() const { return ref_.is_valid() ? ptr_ : NULL; }

  T& operator*() const {
-    CHECK(ref_.is_valid());
+    DCHECK(get() != NULL);
    return *get();
  }
  T* operator->() const {
-    CHECK(ref_.is_valid());
+    DCHECK(get() != NULL);
    return get();
  }

--- a/include/capi/cef_accessibility_handler_capi.h
+++ b/include/capi/cef_accessibility_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=c487e5fd787b1be8224a8981839e0cfdd0ed74f3$
+// $hash=00d5124d346e3f3cc3f53d67bcb766d1d798bf12$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=a4b63e6e7942e3a3961b4f7141a963980178ae6f$
+// $hash=04cfae434fe901644c1c78f1c30c0921518cc666$
 //

 #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,121 +0,0 @@
-// 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
-// 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=7a483ed552ecca4f1aaa03800d366beca1ea2dee$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_AUDIO_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Implement this structure to handle audio events.
-///
-typedef struct _cef_audio_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called on the UI thread to allow configuration of audio stream parameters.
-  // Return true (1) to proceed with audio stream capture, or false (0) to
-  // cancel it. All members of |params| can optionally be configured here, but
-  // they are also pre-filled with some sensible defaults.
-  ///
-  int(CEF_CALLBACK* get_audio_parameters)(struct _cef_audio_handler_t* self,
-                                          struct _cef_browser_t* browser,
-                                          cef_audio_parameters_t* params);
-
-  ///
-  // Called on a browser audio capture thread when the browser starts streaming
-  // audio. OnAudioSteamStopped will always be called after
-  // OnAudioStreamStarted; both functions may be called multiple times for the
-  // same browser. |params| contains the audio parameters like sample rate and
-  // channel layout. |channels| is the number of channels.
-  ///
-  void(CEF_CALLBACK* on_audio_stream_started)(
-      struct _cef_audio_handler_t* self,
-      struct _cef_browser_t* browser,
-      const cef_audio_parameters_t* params,
-      int channels);
-
-  ///
-  // Called on the audio stream thread when a PCM packet is received for the
-  // stream. |data| is an array representing the raw PCM data as a floating
-  // point type, i.e. 4-byte value(s). |frames| is the number of frames in the
-  // PCM packet. |pts| is the presentation timestamp (in milliseconds since the
-  // Unix Epoch) and represents the time at which the decompressed packet should
-  // be presented to the user. Based on |frames| and the |channel_layout| value
-  // passed to OnAudioStreamStarted you can calculate the size of the |data|
-  // array in bytes.
-  ///
-  void(CEF_CALLBACK* on_audio_stream_packet)(struct _cef_audio_handler_t* self,
-                                             struct _cef_browser_t* browser,
-                                             const float** data,
-                                             int frames,
-                                             int64 pts);
-
-  ///
-  // Called on the UI thread when the stream has stopped. OnAudioSteamStopped
-  // will always be called after OnAudioStreamStarted; both functions may be
-  // called multiple times for the same stream.
-  ///
-  void(CEF_CALLBACK* on_audio_stream_stopped)(struct _cef_audio_handler_t* self,
-                                              struct _cef_browser_t* browser);
-
-  ///
-  // Called on the UI or audio stream thread when an error occurred. During the
-  // stream creation phase this callback will be called on the UI thread while
-  // in the capturing phase it will be called on the audio stream thread. The
-  // stream will be stopped immediately.
-  ///
-  void(CEF_CALLBACK* on_audio_stream_error)(struct _cef_audio_handler_t* self,
-                                            struct _cef_browser_t* browser,
-                                            const cef_string_t* message);
-} cef_audio_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // 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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=2b9508a328ed0218e2c576af455f8d76e5978545$
+// $hash=58be0e24b46373bbdad28031891396ea246f446c$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=09b6ebd4116e983b4af634f1efa17b326a3fc517$
+// $hash=ba4033eaf40a8ee24408b89b78496bf1381e7e6b$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_
@@ -41,12 +41,10 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_devtools_message_observer_capi.h"
 #include "include/capi/cef_drag_data_capi.h"
 #include "include/capi/cef_frame_capi.h"
 #include "include/capi/cef_image_capi.h"
 #include "include/capi/cef_navigation_entry_capi.h"
-#include "include/capi/cef_registration_capi.h"
 #include "include/capi/cef_request_context_capi.h"

 #ifdef __cplusplus
@@ -486,71 +484,6 @@ typedef struct _cef_browser_host_t {
  ///
  int(CEF_CALLBACK* has_dev_tools)(struct _cef_browser_host_t* self);

-  ///
-  // Send a function call message over the DevTools protocol. |message| must be
-  // a UTF8-encoded JSON dictionary that contains "id" (int), "function"
-  // (string) and "params" (dictionary, optional) values. See the DevTools
-  // protocol documentation at https://chromedevtools.github.io/devtools-
-  // protocol/ for details of supported functions and the expected "params"
-  // dictionary contents. |message| will be copied if necessary. This function
-  // will return true (1) if called on the UI thread and the message was
-  // successfully submitted for validation, otherwise false (0). Validation will
-  // be applied asynchronously and any messages that fail due to formatting
-  // errors or missing parameters may be discarded without notification. Prefer
-  // ExecuteDevToolsMethod if a more structured approach to message formatting
-  // is desired.
-  //
-  // Every valid function call will result in an asynchronous function result or
-  // error message that references the sent message "id". Event messages are
-  // received while notifications are enabled (for example, between function
-  // calls for "Page.enable" and "Page.disable"). All received messages will be
-  // delivered to the observer(s) registered with AddDevToolsMessageObserver.
-  // See cef_dev_tools_message_observer_t::OnDevToolsMessage documentation for
-  // details of received message contents.
-  //
-  // Usage of the SendDevToolsMessage, ExecuteDevToolsMethod and
-  // AddDevToolsMessageObserver functions does not require an active DevTools
-  // front-end or remote-debugging session. Other active DevTools sessions will
-  // continue to function independently. However, any modification of global
-  // browser state by one session may not be reflected in the UI of other
-  // sessions.
-  //
-  // Communication with the DevTools front-end (when displayed) can be logged
-  // for development purposes by passing the `--devtools-protocol-log-
-  // file=<path>` command-line flag.
-  ///
-  int(CEF_CALLBACK* send_dev_tools_message)(struct _cef_browser_host_t* self,
-                                            const void* message,
-                                            size_t message_size);
-
-  ///
-  // Execute a function call over the DevTools protocol. This is a more
-  // structured version of SendDevToolsMessage. |message_id| is an incremental
-  // number that uniquely identifies the message (pass 0 to have the next number
-  // assigned automatically based on previous values). |function| is the
-  // function name. |params| are the function parameters, which may be NULL. See
-  // the DevTools protocol documentation (linked above) for details of supported
-  // functions and the expected |params| dictionary contents. This function will
-  // return the assigned message ID if called on the UI thread and the message
-  // was successfully submitted for validation, otherwise 0. See the
-  // SendDevToolsMessage documentation for additional usage information.
-  ///
-  int(CEF_CALLBACK* execute_dev_tools_method)(
-      struct _cef_browser_host_t* self,
-      int message_id,
-      const cef_string_t* method,
-      struct _cef_dictionary_value_t* params);
-
-  ///
-  // Add an observer for DevTools protocol messages (function results and
-  // events). The observer will remain registered until the returned
-  // Registration object is destroyed. See the SendDevToolsMessage documentation
-  // for additional usage information.
-  ///
-  struct _cef_registration_t*(CEF_CALLBACK* add_dev_tools_message_observer)(
-      struct _cef_browser_host_t* self,
-      struct _cef_dev_tools_message_observer_t* observer);
-
  ///
  // Retrieve a snapshot of current navigation entries as values sent to the
  // specified visitor. If |current_only| is true (1) only the current
@@ -562,6 +495,19 @@ typedef struct _cef_browser_host_t {
      struct _cef_navigation_entry_visitor_t* visitor,
      int current_only);

+  ///
+  // Set whether mouse cursor change is disabled.
+  ///
+  void(CEF_CALLBACK* set_mouse_cursor_change_disabled)(
+      struct _cef_browser_host_t* self,
+      int disabled);
+
+  ///
+  // Returns true (1) if mouse cursor change is disabled.
+  ///
+  int(CEF_CALLBACK* is_mouse_cursor_change_disabled)(
+      struct _cef_browser_host_t* self);
+
  ///
  // If a misspelled word is currently selected in an editable node calling this
  // function will replace it with the specified |word|.
--- a/include/capi/cef_browser_process_handler_capi.h
+++ b/include/capi/cef_browser_process_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=f0cd169568e9ea5bcc8bf2aa891691b76c05356d$
+// $hash=b15ba2c750f5227b6b40fea59965817ba4431ee0$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
@@ -41,7 +41,6 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_client_capi.h"
 #include "include/capi/cef_command_line_capi.h"
 #include "include/capi/cef_print_handler_capi.h"
 #include "include/capi/cef_values_capi.h"
@@ -61,25 +60,6 @@ typedef struct _cef_browser_process_handler_t {
  ///
  cef_base_ref_counted_t base;

-  ///
-  // Called on the browser process UI thread to retrieve the list of schemes
-  // that should support cookies. If |include_defaults| is true (1) the default
-  // schemes ("http", "https", "ws" and "wss") will also be supported. Providing
-  // an NULL |schemes| value and setting |include_defaults| to false (0) will
-  // disable all loading and saving of cookies.
-  //
-  // This state will apply to the cef_cookie_manager_t associated with the
-  // global cef_request_context_t. It will also be used as the initial state for
-  // any new cef_request_context_ts created by the client. After creating a new
-  // cef_request_context_t the cef_cookie_manager_t::SetSupportedSchemes
-  // function may be called on the associated cef_cookie_manager_t to futher
-  // override these values.
-  ///
-  void(CEF_CALLBACK* get_cookieable_schemes)(
-      struct _cef_browser_process_handler_t* self,
-      cef_string_list_t schemes,
-      int* include_defaults);
-
  ///
  // Called on the browser process UI thread immediately after the CEF context
  // has been initialized.
@@ -98,6 +78,17 @@ typedef struct _cef_browser_process_handler_t {
      struct _cef_browser_process_handler_t* self,
      struct _cef_command_line_t* command_line);

+  ///
+  // Called on the browser process IO thread after the main thread has been
+  // created for a new render process. Provides an opportunity to specify extra
+  // information that will be passed to
+  // cef_render_process_handler_t::on_render_thread_created() in the render
+  // process. Do not keep a reference to |extra_info| outside of this function.
+  ///
+  void(CEF_CALLBACK* on_render_process_thread_created)(
+      struct _cef_browser_process_handler_t* self,
+      struct _cef_list_value_t* extra_info);
+
  ///
  // Return the handler for printing on Linux. If a print handler is not
  // provided then printing will not be supported on the Linux platform.
@@ -121,16 +112,6 @@ typedef struct _cef_browser_process_handler_t {
  void(CEF_CALLBACK* on_schedule_message_pump_work)(
      struct _cef_browser_process_handler_t* self,
      int64 delay_ms);
-
-  ///
-  // Return the default client for use with a newly created browser window. If
-  // null is returned the browser will be unmanaged (no callbacks will be
-  // executed for that browser) and application shutdown will be blocked until
-  // the browser window is closed manually. This function is currently only used
-  // with the chrome runtime.
-  ///
-  struct _cef_client_t*(CEF_CALLBACK* get_default_client)(
-      struct _cef_browser_process_handler_t* self);
 } cef_browser_process_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_callback_capi.h
+++ b/include/capi/cef_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=cd8c183355a6808abd763ecc0396b5da6c15b3f9$
+// $hash=5c540e617cf2782876defad365e85cd43932ffce$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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,14 +33,13 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=4cfcac55d2a1dee466a2a0753f30fb34a78ef3b2$
+// $hash=6a0312765614a697d56e87c8503afba8404bb08b$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
 #pragma once

-#include "include/capi/cef_audio_handler_capi.h"
 #include "include/capi/cef_base_capi.h"
 #include "include/capi/cef_context_menu_handler_capi.h"
 #include "include/capi/cef_dialog_handler_capi.h"
@@ -70,12 +69,6 @@ typedef struct _cef_client_t {
  ///
  cef_base_ref_counted_t base;

-  ///
-  // Return the handler for audio rendering events.
-  ///
-  struct _cef_audio_handler_t*(CEF_CALLBACK* get_audio_handler)(
-      struct _cef_client_t* self);
-
  ///
  // Return the handler for context menus. If no handler is provided the default
  // implementation will be used.
--- a/include/capi/cef_command_line_capi.h
+++ b/include/capi/cef_command_line_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=5af5bf1e877dd53f21f751d332a9e2166817324c$
+// $hash=72ba5fe0cc6fe8081ec7b2b556e9022d1c6e8c61$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
--- a/include/capi/cef_context_menu_handler_capi.h
+++ b/include/capi/cef_context_menu_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=bd04d49bcd5d269f237c92163b40435d5588209b$
+// $hash=fcb0328c54e5f629c24bfd232d75c31c372ab6ac$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=20ba58ac3e861344ee738b58433869223c757e24$
+// $hash=2f5721138da26a9d7cce300a635b58dae9f51a4a$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=5e19231e3476eef376c2742e8d375bee7bd4ea2d$
+// $hash=2b24c7d99c59c669719b822f5ea19763d140b001$
 //

 #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,147 +0,0 @@
-// 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
-// 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=1a256c04042ebd4867f39e1c31def558871b2bab$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_DEVTOOLS_MESSAGE_OBSERVER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_browser_t;
-
-///
-// Callback structure for cef_browser_host_t::AddDevToolsMessageObserver. The
-// functions of this structure will be called on the browser process UI thread.
-///
-typedef struct _cef_dev_tools_message_observer_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Method that will be called on receipt of a DevTools protocol message.
-  // |browser| is the originating browser instance. |message| is a UTF8-encoded
-  // JSON dictionary representing either a function result or an event.
-  // |message| is only valid for the scope of this callback and should be copied
-  // if necessary. Return true (1) if the message was handled or false (0) if
-  // the message should be further processed and passed to the
-  // OnDevToolsMethodResult or OnDevToolsEvent functions as appropriate.
-  //
-  // Method result dictionaries include an "id" (int) value that identifies the
-  // orginating function call sent from cef_browser_host_t::SendDevToolsMessage,
-  // and optionally either a "result" (dictionary) or "error" (dictionary)
-  // value. The "error" dictionary will contain "code" (int) and "message"
-  // (string) values. Event dictionaries include a "function" (string) value and
-  // optionally a "params" (dictionary) value. See the DevTools protocol
-  // documentation at https://chromedevtools.github.io/devtools-protocol/ for
-  // details of supported function calls and the expected "result" or "params"
-  // dictionary contents. JSON dictionaries can be parsed using the CefParseJSON
-  // function if desired, however be aware of performance considerations when
-  // parsing large messages (some of which may exceed 1MB in size).
-  ///
-  int(CEF_CALLBACK* on_dev_tools_message)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser,
-      const void* message,
-      size_t message_size);
-
-  ///
-  // Method that will be called after attempted execution of a DevTools protocol
-  // function. |browser| is the originating browser instance. |message_id| is
-  // the "id" value that identifies the originating function call message. If
-  // the function succeeded |success| will be true (1) and |result| will be the
-  // UTF8-encoded JSON "result" dictionary value (which may be NULL). If the
-  // function failed |success| will be false (0) and |result| will be the
-  // UTF8-encoded JSON "error" dictionary value. |result| is only valid for the
-  // scope of this callback and should be copied if necessary. See the
-  // OnDevToolsMessage documentation for additional details on |result|
-  // contents.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_method_result)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser,
-      int message_id,
-      int success,
-      const void* result,
-      size_t result_size);
-
-  ///
-  // Method that will be called on receipt of a DevTools protocol event.
-  // |browser| is the originating browser instance. |function| is the "function"
-  // value. |params| is the UTF8-encoded JSON "params" dictionary value (which
-  // may be NULL). |params| is only valid for the scope of this callback and
-  // should be copied if necessary. See the OnDevToolsMessage documentation for
-  // additional details on |params| contents.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_event)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser,
-      const cef_string_t* method,
-      const void* params,
-      size_t params_size);
-
-  ///
-  // Method that will be called when the DevTools agent has attached. |browser|
-  // is the originating browser instance. This will generally occur in response
-  // to the first message sent while the agent is detached.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_agent_attached)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser);
-
-  ///
-  // Method that will be called when the DevTools agent has detached. |browser|
-  // is the originating browser instance. Any function results that were pending
-  // before the agent became detached will not be delivered, and any active
-  // event subscriptions will be canceled.
-  ///
-  void(CEF_CALLBACK* on_dev_tools_agent_detached)(
-      struct _cef_dev_tools_message_observer_t* self,
-      struct _cef_browser_t* browser);
-} cef_dev_tools_message_observer_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // 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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=5ae5556e4085faf8cf17ee757f5eeac9197f75c0$
+// $hash=3253c217564ae9a85a1e971298c32a35e4cad136$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=067fd169a30bec1ad8eeacc5ab1ac750cf59640e$
+// $hash=951c936c8070dbf9bd246cc766b81cdfe06a3d81$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
@@ -141,19 +141,6 @@ typedef struct _cef_display_handler_t {
      struct _cef_display_handler_t* self,
      struct _cef_browser_t* browser,
      double progress);
-
-  ///
-  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
-  // |custom_cursor_info| will be populated with the custom cursor information.
-  // Return true (1) if the cursor change was handled or false (0) for default
-  // handling.
-  ///
-  int(CEF_CALLBACK* on_cursor_change)(
-      struct _cef_display_handler_t* self,
-      struct _cef_browser_t* browser,
-      cef_cursor_handle_t cursor,
-      cef_cursor_type_t type,
-      const struct _cef_cursor_info_t* custom_cursor_info);
 } cef_display_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_dom_capi.h
+++ b/include/capi/cef_dom_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=0517dc6c42fdde9fecfc4549fab1ea12b614e143$
+// $hash=055c506e7950abba3ec1c12adbbb1a9989cf5ac5$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=f0ceb73b289072a01c45c6e7abf339a4ec924d29$
+// $hash=3399f17cc69d8fbd5c09f63f81680aa1f68454f0$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d84044bb582b029af5fa46c75f35b3da948dffd2$
+// $hash=d6366977af5e2a3a71b4f57042208ff7ed524c6c$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=9663321e2be1d000ac54e195c81f210ae40773d1$
+// $hash=6c8c654be3e69d872b3cfa6bdfb1adf615bff3ac$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=1cc1f134e68406ae3b05f7e181e12f27262772f0$
+// $hash=78022908355fbf836799545e67ce2e4663b85fdf$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=5d5251098be1477705de2a21502dec2d8338ce00$
+// $hash=b50087959cb679e4132f0fccfd23f01f76079018$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=c952241dabb9d99109ebb64acba0124e43150628$
+// $hash=a13b5b607d5a2108fac5fe75f5ebd2ede7eaef6a$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=00d75d4f1968686cec7db84a59df89d98d8fe146$
+// $hash=c930140791b9e7d4238110e24fe17b9566a34ec9$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=03bb69a14868a95abf3bf7b1608dc351480e307f$
+// $hash=2aa57426a91e10985a5e92830bc3bcd9287708d4$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=0fccb41381e922e9d9545ae45ba3e6cf1916c4b0$
+// $hash=091dd994f37070e9d7c27d0e2f7411ea9cf068f5$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=bce865a34f45e6dee8f413f0d6bd7f4c37ab55c0$
+// $hash=d8f114b44d02d96b5da0ec399c99091b9ceb6871$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
--- a/include/capi/cef_image_capi.h
+++ b/include/capi/cef_image_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d9da8862142742e780086714bbd4fb44ac95cf2c$
+// $hash=5afa8e95e6e7bddbd3c442e99b4c2843efb18c49$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d991e2a7d1a58a013e4d3a963361fed6918f4ec3$
+// $hash=e68da1a5db612699b7b727edea2bb629f5d67103$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d804a2db0f9ac13afd249407c85cb8d5852508ac$
+// $hash=70108de432674485dee079e541e0dacd6a437961$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d7521ac4f73dabd876344400a165d15954c770b0$
+// $hash=d6e91d55d41f729dca94ba5766f57849f29d0796$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=6c6a719d7cbbc01adfdc9bbe0dff6da10e06e3f3$
+// $hash=fa3cb1461b9d363c6c7d961f9e291c2fe736170e$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=3767c7759578cd4abc1c2ecef504e7ed60775abb$
+// $hash=a7070419332ec8f6d6e4df898c8eb666b988970a$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
@@ -50,7 +50,6 @@ extern "C" {
 struct _cef_media_observer_t;
 struct _cef_media_route_create_callback_t;
 struct _cef_media_route_t;
-struct _cef_media_sink_device_info_callback_t;
 struct _cef_media_sink_t;
 struct _cef_media_source_t;

@@ -247,6 +246,11 @@ typedef struct _cef_media_sink_t {
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_sink_t* self);

+  ///
+  // Returns true (1) if this sink is valid.
+  ///
+  int(CEF_CALLBACK* is_valid)(struct _cef_media_sink_t* self);
+
  ///
  // Returns the name of this sink.
  ///
@@ -260,19 +264,6 @@ typedef struct _cef_media_sink_t {
  cef_string_userfree_t(CEF_CALLBACK* get_description)(
      struct _cef_media_sink_t* self);

-  ///
-  // Returns the icon type for this sink.
-  ///
-  cef_media_sink_icon_type_t(CEF_CALLBACK* get_icon_type)(
-      struct _cef_media_sink_t* self);
-
-  ///
-  // Asynchronously retrieves device info.
-  ///
-  void(CEF_CALLBACK* get_device_info)(
-      struct _cef_media_sink_t* self,
-      struct _cef_media_sink_device_info_callback_t* callback);
-
  ///
  // Returns true (1) if this sink accepts content via Cast.
  ///
@@ -290,25 +281,6 @@ typedef struct _cef_media_sink_t {
                                        struct _cef_media_source_t* source);
 } cef_media_sink_t;

-///
-// Callback structure for cef_media_sink_t::GetDeviceInfo. The functions of this
-// structure will be called on the browser process UI thread.
-///
-typedef struct _cef_media_sink_device_info_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Method that will be executed asyncronously once device information has been
-  // retrieved.
-  ///
-  void(CEF_CALLBACK* on_media_sink_device_info)(
-      struct _cef_media_sink_device_info_callback_t* self,
-      const struct _cef_media_sink_device_info_t* device_info);
-} cef_media_sink_device_info_callback_t;
-
 ///
 // Represents a source from which media can be routed. Instances of this object
 // are retrieved via cef_media_router_t::GetSource. The functions of this
@@ -327,6 +299,11 @@ typedef struct _cef_media_source_t {
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_source_t* self);

+  ///
+  // Returns true (1) if this source is valid.
+  ///
+  int(CEF_CALLBACK* is_valid)(struct _cef_media_source_t* self);
+
  ///
  // Returns true (1) if this source outputs its content via Cast.
  ///
--- a/include/capi/cef_menu_model_capi.h
+++ b/include/capi/cef_menu_model_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=28fa978051bd3ddff69d58e0dc8f445f64a61480$
+// $hash=cce24dba079162b10f359769eea176c4009b5ce5$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=edc411cb0447a6c2965cdeb5f709fe56c43ec2bb$
+// $hash=071ec8a0e17d3b33acbf36c7ccc26d0995657cf3$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=f14afbd6941bcb37b14cce81569882512c3d7194$
+// $hash=c6252024911652a4881d753aeeeb2615e6be3904$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=6798e6147540596c1abac8c7457d9d1d4d99bd54$
+// $hash=8a26e2f8273298dcf44d6fbf32fd565f6aaa912c$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=84149324b177c47287b935dcb3d5900a33acfdf5$
+// $hash=3bc4225f43428d8a3a24dcac1830dafac18b0caf$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
@@ -140,24 +140,16 @@ CEF_EXPORT struct _cef_value_t* cef_parse_json(
    const cef_string_t* json_string,
    cef_json_parser_options_t options);

-///
-// Parses the specified UTF8-encoded |json| buffer of size |json_size| and
-// returns a dictionary or list representation. If JSON parsing fails this
-// function returns NULL.
-///
-CEF_EXPORT struct _cef_value_t* cef_parse_json_buffer(
-    const void* json,
-    size_t json_size,
-    cef_json_parser_options_t options);
-
 ///
 // Parses the specified |json_string| and returns a dictionary or list
 // representation. If JSON parsing fails this function returns NULL and
-// populates |error_msg_out| with a formatted error message.
+// populates |error_code_out| and |error_msg_out| with an error code and a
+// formatted error message respectively.
 ///
 CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
    const cef_string_t* json_string,
    cef_json_parser_options_t options,
+    cef_json_parser_error_t* error_code_out,
    cef_string_t* error_msg_out);

 ///
--- a/include/capi/cef_path_util_capi.h
+++ b/include/capi/cef_path_util_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=0ae1fe7f7141eb05eb7fd44c2d41e4c576afae1e$
+// $hash=1b218a91d7f3ba0e68f0c3be21a0df91e515d28a$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=54ed1e16c5c1d133bcd097350c5f5871228efd4f$
+// $hash=b8d7be1399d3426a3f872b12bc1438e041a16308$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=4b52323c4ce2d0ebcc3438e16fc9a9b181a58adc$
+// $hash=8f7d7993691e07f4a8a42d63522c751cfba3c168$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=53ff22b73527aa331d2bd96e008f4cb4f0413042$
+// $hash=79ec6d99ea47e1cf9b2cca0433704f205e14d3bd$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=c476a8d22852994d9d9695db901efaef13bbfc9d$
+// $hash=75b16fd9d592c1d22b94d740e1deb61efe3afb97$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=8cde223bdb8d25ff163edd95da0d9e238b298016$
+// $hash=029e237cf80f94a25453bac5a9b1e0765bb56f37$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=e4bdab963041a270edabc0954b415eb4cae8e5cb$
+// $hash=e642fc1fe3b97a90c0eae7f0fc0a5cfd385e3e17$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
@@ -159,6 +159,17 @@ typedef struct _cef_render_handler_t {
                                           cef_rect_t const* dirtyRects,
                                           void* shared_handle);

+  ///
+  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
+  // |custom_cursor_info| will be populated with the custom cursor information.
+  ///
+  void(CEF_CALLBACK* on_cursor_change)(
+      struct _cef_render_handler_t* self,
+      struct _cef_browser_t* browser,
+      cef_cursor_handle_t cursor,
+      cef_cursor_type_t type,
+      const struct _cef_cursor_info_t* custom_cursor_info);
+
  ///
  // Called when the user starts dragging content in the web view. Contextual
  // information about the dragged content is supplied by |drag_data|. (|x|,
--- a/include/capi/cef_render_process_handler_capi.h
+++ b/include/capi/cef_render_process_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=41339414bca54054046a8f7fbce402a0e0dd8020$
+// $hash=3630a82a4ea731b43ed4ba468a57c5dfe15f8679$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_
@@ -64,6 +64,16 @@ typedef struct _cef_render_process_handler_t {
  ///
  cef_base_ref_counted_t base;

+  ///
+  // Called after the render process main thread has been created. |extra_info|
+  // is a read-only value originating from
+  // cef_browser_process_handler_t::on_render_process_thread_created(). Do not
+  // keep a reference to |extra_info| outside of this function.
+  ///
+  void(CEF_CALLBACK* on_render_thread_created)(
+      struct _cef_render_process_handler_t* self,
+      struct _cef_list_value_t* extra_info);
+
  ///
  // Called after WebKit has been initialized.
  ///
--- a/include/capi/cef_request_callback_capi.h
+++ b/include/capi/cef_request_callback_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=273af5bd01c6ab5d4df8efb2af2b4e2da9c21760$
+// $hash=3efd81a4bfdfca579a77f14bd37b8192122ebda4$
 //

 #ifndef 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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=a5e9055958c3588d583d4d128a5d7c8639f39946$
+// $hash=b3725b8fa4118936caacda69504dc597f3620d82$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d5079b6a5146ccd2085c3bbf948925c009d329ed$
+// $hash=7ce0953f069204a4dd2037c4a05ac9454c5e66a6$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
--- a/include/capi/cef_request_context_handler_capi.h
+++ b/include/capi/cef_request_context_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=fa148db8a0ecd79966814086fb92e439687be701$
+// $hash=e758d8c53334b91bce818cc6e9f84915778d7827$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_
--- a/include/capi/cef_request_handler_capi.h
+++ b/include/capi/cef_request_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=1d8b3f540a8305ce1738c5fe7c716434062c67b0$
+// $hash=a28219cc8c1cb53faacaf236374c3cf2c0c45bef$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_
@@ -253,14 +253,6 @@ typedef struct _cef_request_handler_t {
      struct _cef_request_handler_t* self,
      struct _cef_browser_t* browser,
      cef_termination_status_t status);
-
-  ///
-  // Called on the browser process UI thread when the window.document object of
-  // the main frame has been created.
-  ///
-  void(CEF_CALLBACK* on_document_available_in_main_frame)(
-      struct _cef_request_handler_t* self,
-      struct _cef_browser_t* browser);
 } cef_request_handler_t;

 #ifdef __cplusplus
--- a/include/capi/cef_resource_bundle_capi.h
+++ b/include/capi/cef_resource_bundle_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=ffe0de3b50e0a612bd1b055b873c265b030e721d$
+// $hash=b9577b495df3990284d4e4a3db2824196175dc91$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_CAPI_H_
@@ -41,7 +41,6 @@
 #pragma once

 #include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_values_capi.h"

 #ifdef __cplusplus
 extern "C" {
@@ -71,25 +70,34 @@ typedef struct _cef_resource_bundle_t {
      int string_id);

  ///
-  // Returns a cef_binary_value_t containing the decompressed contents of the
-  // specified scale independent |resource_id| or NULL if not found. Include
-  // cef_pack_resources.h for a listing of valid resource ID values.
+  // Retrieves the contents of the specified scale independent |resource_id|. If
+  // the value is found then |data| and |data_size| will be populated and this
+  // function will return true (1). If the value is not found then this function
+  // will return false (0). The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource)(
-      struct _cef_resource_bundle_t* self,
-      int resource_id);
+  int(CEF_CALLBACK* get_data_resource)(struct _cef_resource_bundle_t* self,
+                                       int resource_id,
+                                       void** data,
+                                       size_t* data_size);

  ///
-  // Returns a cef_binary_value_t containing the decompressed contents of the
-  // specified |resource_id| nearest the scale factor |scale_factor| or NULL if
-  // not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale
-  // independent resources or call GetDataResource instead.Include
-  // cef_pack_resources.h for a listing of valid resource ID values.
+  // Retrieves the contents of the specified |resource_id| nearest the scale
+  // factor |scale_factor|. Use a |scale_factor| value of SCALE_FACTOR_NONE for
+  // scale independent resources or call GetDataResource instead. If the value
+  // is found then |data| and |data_size| will be populated and this function
+  // will return true (1). If the value is not found then this function will
+  // return false (0). The returned |data| pointer will remain resident in
+  // memory and should not be freed. Include cef_pack_resources.h for a listing
+  // of valid resource ID values.
  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_data_resource_for_scale)(
+  int(CEF_CALLBACK* get_data_resource_for_scale)(
      struct _cef_resource_bundle_t* self,
      int resource_id,
-      cef_scale_factor_t scale_factor);
+      cef_scale_factor_t scale_factor,
+      void** data,
+      size_t* data_size);
 } cef_resource_bundle_t;

 ///
--- a/include/capi/cef_resource_bundle_handler_capi.h
+++ b/include/capi/cef_resource_bundle_handler_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=b9723e0dfe6d03c24665eac2264396743a5254df$
+// $hash=fd90a707c59a8c04b1b1bfc6129a90e27934f501$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=a9598f4e94a864e749b425aa62bc519589f5753e$
+// $hash=5241e3dd5d3fa0b17dd6d6ea2f30734a32150c88$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=aec52d0efc8407495fe1fc4821616673da7ed17a$
+// $hash=afc96f188710bd336d09ce479a650aaa3a55357a$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_REQUEST_HANDLER_CAPI_H_
--- a/include/capi/cef_response_capi.h
+++ b/include/capi/cef_response_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=8202bbf8e7f7ae474182c483f0f599b13f6914eb$
+// $hash=2bccae35945ecea55c4c79bba840b44a691f1aa3$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=cdadf516dc77455c5a3d6633bfb12e1cb276b9bb$
+// $hash=5b2602702a13a71ac012808eecb09bb8b9494551$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=9384e0b2bc27ccbdd7ebb1a86f213c28fd2784a1$
+// $hash=d93b4ad0b71ffe0a05326b39c3ed0bdb26a73fac$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=37b3332057dbcf705b61a51cf14640d171d18a74$
+// $hash=ffd489adc301ed88e1f30f8f38cec1730411a4b5$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=aefb3b63aba8f5df6ab6dc11e2029820c75c36cf$
+// $hash=badaadcff4641fea876fb626b8ffe5a6f34a376c$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=93eb2bc0f51da08a41fb906436654b3452b74fb3$
+// $hash=3755121a7b89de52a67885ac1c6d12de23f4b657$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=61ff7a4ebc917482bad5daba7089b92cc62bada8$
+// $hash=bd5bbcdc385f83512bf64304e180f1a05b765c16$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=30d4a63d53bce310ad641cbe5096ae126a664076$
+// $hash=bba3a9719860f9a81c63cbb052a4c501416b2ada$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=a8b2162b7c3b7cede392e8531c46a1277e990689$
+// $hash=025daa5db3bf16029953da7703e3e5968bd97fe2$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=9a471c97e43ad3d1d042ba3dc6d887f2f4b0d851$
+// $hash=370cdeaa3252a9ed0e1a627d858dcab23af24ee1$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_THREAD_CAPI_H_
@@ -98,8 +98,8 @@ typedef struct _cef_thread_t {
 // identify the thread. |priority| is the thread execution priority.
 // |message_loop_type| indicates the set of asynchronous events that the thread
 // can process. If |stoppable| is true (1) the thread will stopped and joined on
-// destruction or when stop() is called; otherwise, the thread cannot be stopped
-// and will be leaked on shutdown. On Windows the |com_init_mode| value
+// destruction or when stop() is called; otherwise, the the thread cannot be
+// stopped and will be leaked on shutdown. On Windows the |com_init_mode| value
 // specifies how COM will be initialized for the thread. If |com_init_mode| is
 // set to COM_INIT_MODE_STA then |message_loop_type| must be set to ML_TYPE_UI.
 ///
--- a/include/capi/cef_trace_capi.h
+++ b/include/capi/cef_trace_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=99779f8a728d2e1a0b87d6d6b89bd28e5da16d4c$
+// $hash=b1b96b7cb636afbd201b88bc1544afc58099c0b6$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=11c227079ec0687adeaa8a085aeec37c89346ee7$
+// $hash=63d875f5a922dd2c2e1efaaf0ddaa20475f79ef8$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_
@@ -115,13 +115,20 @@ typedef struct _cef_urlrequest_t {
 // Create a new URL request that is not associated with a specific browser or
 // frame. Use cef_frame_t::CreateURLRequest instead if you want the request to
 // have this association, in which case it may be handled differently (see
-// documentation on that function). A request created with this function may
-// only originate from the browser process, and will behave as follows:
+// documentation on that function). Requests may originate from the both browser
+// process and the render process.
+//
+// For requests originating from the browser process:
 //   - It may be intercepted by the client via CefResourceRequestHandler or
 //     CefSchemeHandlerFactory.
 //   - POST data may only contain only a single element of type PDE_TYPE_FILE
 //     or PDE_TYPE_BYTES.
 //   - If |request_context| is empty the global request context will be used.
+// For requests originating from the render process:
+//   - It cannot be intercepted by the client so only http(s) and blob schemes
+//     are supported.
+//   - POST data may only contain a single element of type PDE_TYPE_BYTES.
+//   - The |request_context| parameter must be NULL.
 //
 // The |request| object will be marked as read-only after calling this function.
 ///
--- a/include/capi/cef_v8_capi.h
+++ b/include/capi/cef_v8_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=23dc3ab761547687a491e5d7303b73b2d0d54e7a$
+// $hash=3bb8f9801a153172981120926c7a5629e08d7131$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d9074be0e6960c69cfe2c39b92b4dd6f529210d1$
+// $hash=22f935968cd7f2549def42f5d84694311bde125e$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=ed698ff6cb09ee2ed87614e2733c742db827ed4f$
+// $hash=aedfa5758cbf37dff244c065d55d273231470877$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d8b5b641cc036a9cd9375442254d558b066ada69$
+// $hash=f1b2b6203d45fdf76d72ea1e79fcef0bb2a26138$
 //

 #ifndef CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_
@@ -58,7 +58,7 @@ typedef struct _cef_web_plugin_info_t {
  cef_base_ref_counted_t base;

  ///
-  // Returns the plugin name.
+  // Returns the plugin name (i.e. Flash).
  ///
  // The resulting string must be freed by calling cef_string_userfree_free().
  cef_string_userfree_t(CEF_CALLBACK* get_name)(
--- a/include/capi/cef_x509_certificate_capi.h
+++ b/include/capi/cef_x509_certificate_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=e06ad8a1e173edd1e888ce6a8f8a9d95394e6a44$
+// $hash=2d04c2cc1791b90ddb9333fe830ad07042e9df2d$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=76de25a0d0f0a2cc4657f46c26ec44b6d7d937e8$
+// $hash=64f6b6477ec81b1d64517cf0af2e3b2121ff39bd$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=d3d4ee91a69edd5f12785871b5c5a55e86c5c675$
+// $hash=f8b7ec1654c7d62153e2670b52ed18eb4c9c58d5$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=f9db602ed3bcb4b8ceb583034db9d0297b2961fd$
+// $hash=44811580a3bddb5efed7d697ef8fa0b7e0925ef2$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=a20dfae14509f99270e5ce1422790681aee2d5f2$
+// $hash=a5d8033127cf2d21f1cb0c87f76d2d59ec3eace0$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=069553694811acdd7a7871c895d73fc4f3e2798a$
+// $hash=ddf96505520b7f8df0662d9f66221917a665b029$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=0fbd582ed5d0231550840ebf3eed2e488ac546d4$
+// $hash=3ac114f5bd9aa0e6d62e7540e9205adce485a09d$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=37bbfadf761b3a1996276885d593d27d3fed5f8d$
+// $hash=f850005cb52b08b69b803fc020c77fc7f623839c$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=eb8e4197f2dba4829b1ed54957e1d5043fb8adaa$
+// $hash=066842f6905c8eed7de1fc8cf831e06801029b97$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=f4c4a72bf4db6abaf709f5ce4fb648c2532c85bc$
+// $hash=71def746b63431f9aa779bbb67e85bc2e0176615$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=1f9c61687a16a5c095c73afd47c1c0a27096ab3c$
+// $hash=422243fda6e1404222aca7bdd4e7b84b961a9626$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_DISPLAY_CAPI_H_
@@ -50,9 +50,9 @@ extern "C" {
 // This structure typically, but not always, corresponds to a physical display
 // connected to the system. A fake Display may exist on a headless system, or a
 // Display may correspond to a remote, virtual display. All size and position
-// values are in density independent pixel (DIP) coordinates unless otherwise
-// indicated. Methods must be called on the browser process UI thread unless
-// otherwise indicated.
+// values are in density independent pixels (DIP) unless otherwise indicated.
+// Methods must be called on the browser process UI thread unless otherwise
+// indicated.
 ///
 typedef struct _cef_display_t {
  ///
@@ -74,28 +74,27 @@ typedef struct _cef_display_t {
  float(CEF_CALLBACK* get_device_scale_factor)(struct _cef_display_t* self);

  ///
-  // Convert |point| from DIP coordinates to pixel coordinates using this
-  // Display's device scale factor.
+  // Convert |point| from density independent pixels (DIP) to pixel coordinates
+  // using this Display's device scale factor.
  ///
  void(CEF_CALLBACK* convert_point_to_pixels)(struct _cef_display_t* self,
                                              cef_point_t* point);

  ///
-  // Convert |point| from pixel coordinates to DIP coordinates using this
-  // Display's device scale factor.
+  // Convert |point| from pixel coordinates to density independent pixels (DIP)
+  // using this Display's device scale factor.
  ///
  void(CEF_CALLBACK* convert_point_from_pixels)(struct _cef_display_t* self,
                                                cef_point_t* point);

  ///
-  // Returns this Display's bounds in DIP screen coordinates. This is the full
-  // size of the display.
+  // Returns this Display's bounds. This is the full size of the display.
  ///
  cef_rect_t(CEF_CALLBACK* get_bounds)(struct _cef_display_t* self);

  ///
-  // Returns this Display's work area in DIP screen coordinates. This excludes
-  // areas of the display that are occupied with window manager toolbars, etc.
+  // Returns this Display's work area. This excludes areas of the display that
+  // are occupied for window manager toolbars, etc.
  ///
  cef_rect_t(CEF_CALLBACK* get_work_area)(struct _cef_display_t* self);

@@ -112,7 +111,7 @@ CEF_EXPORT cef_display_t* cef_display_get_primary();

 ///
 // Returns the Display nearest |point|. Set |input_pixel_coords| to true (1) if
-// |point| is in pixel screen coordinates instead of DIP screen coordinates.
+// |point| is in pixel coordinates instead of density independent pixels (DIP).
 ///
 CEF_EXPORT cef_display_t* cef_display_get_nearest_point(
    const cef_point_t* point,
@@ -120,8 +119,8 @@ CEF_EXPORT cef_display_t* cef_display_get_nearest_point(

 ///
 // Returns the Display that most closely intersects |bounds|.  Set
-// |input_pixel_coords| to true (1) if |bounds| is in pixel screen coordinates
-// instead of DIP screen coordinates.
+// |input_pixel_coords| to true (1) if |bounds| is in pixel coordinates instead
+// of density independent pixels (DIP).
 ///
 CEF_EXPORT cef_display_t* cef_display_get_matching_bounds(
    const cef_rect_t* bounds,
--- a/include/capi/views/cef_fill_layout_capi.h
+++ b/include/capi/views/cef_fill_layout_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=967f99321db8d0a900e33f3032b3ba1a6bd6bc9c$
+// $hash=14016ebf5d63f625436aebd14396e403b673703f$
 //

 #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) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2020 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=ae11ffbfed64dc255909f01a7abccbf6acfb5922$
+// $hash=d947a566036f44439f352aea45098dfb46043b9a$
 //

 #ifndef CEF_INCLUDE_CAPI_VIEWS_CEF_LABEL_BUTTON_CAPI_H_
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike Wiedenbauer	1c446e7301	Fix AltGr handling for OSR keyboard events (fixes issue #2892 )	2020-04-08 11:47:26 -04:00
Marshall Greenblatt	7b802c9272	Update to Chromium version 80.0.3987.163	2020-04-03 14:18:21 -04:00
Mike Wiedenbauer	a33bdbcdb4	Linux: Fix CefPrintHandler callbacks from PDF viewer (fixes issue #2906 )	2020-04-02 17:38:37 -04:00
Andrei Kurushin	a3e4933507	Windows: cefclient: Fix accessibility where TreeId type has changed from int to string	2020-04-02 17:38:29 -04:00
Andy Tzeng	d12ef0f15d	Fix UU_REPLACE_PLUS_WITH_SPACE value to match Chromium (fixes issue #2904 )	2020-04-02 17:38:21 -04:00
Vladislav	cce1b63049	Fix OSR popup position when the view origin is offset in screen coords (fixes issue #2902 )	2020-04-02 17:38:12 -04:00
Marshall Greenblatt	badf1061f2	Windows: Skip InitializeSandboxInfo if the sandbox is disabled. Calling InitializeSandboxInfo from inside libcef won’t work unless libcef is statically linked with the executable, so there's no point in doing so. See the Chromium sandbox docs for background.	2020-04-02 17:36:58 -04:00
Cristian Amarie	ec58f88052	Remove unexpected content headers when converting from POST to GET request on 302 redirect response (fixes issue #2883 )	2020-04-02 17:34:37 -04:00
Andrei Kurushin	e70b0c3cfe	Fix CefFrame::GetSource crash on detached frame (fixes issue #2898 )	2020-04-02 17:34:26 -04:00
Mike Wiedenbauer	1802ceeb85	Enable smooth scrolling with OSR (fixes issue #2895 )	2020-04-02 17:34:15 -04:00
Marshall Greenblatt	919206cd65	Mac: Remove unicode character in README.redistrib.txt (fixes issue #2910 )	2020-04-02 13:42:59 -04:00
Marshall Greenblatt	52b5cc5da4	Fix no newline at end of file error with Xcode 11.3.1	2020-04-02 13:38:17 -04:00
Marshall Greenblatt	892739653a	Always persist local_state by default (fixes issue #2890 ) If a cache_path is specified local_state will now be persisted to a LocalPrefs.json file. This is necessary because local_state is used to store the cookie encryption key on Windows.	2020-04-01 16:59:22 -04:00
Marshall Greenblatt	29aedaf650	Windows: Fix warning C4457: declaration of 'result' hides function parameter in VS2019	2020-04-01 15:59:10 -04:00
Marshall Greenblatt	9d2a31ec60	Update to Chromium version 80.0.3987.149	2020-03-27 18:53:34 -04:00
Marshall Greenblatt	05e96e04fa	Convert CefCookieManagerImpl to use CefBrowserContext::Getter. With this change CefCookieManagerImpl no longer keeps a reference to the originating CefRequestContextImpl. This means that the CefRequestContextImpl can be destroyed if all other references are released while the CefCookieManagerImpl exists. If CefRequestContextImpl destruction results in the underlying CefBrowserContext being destroyed then the CefCookieManagerImpl's reference to that CefBrowserContext will be invalidated. This is the same ownership model introduced with CefMediaRouterImpl in the previous commit.	2020-03-27 17:27:34 -04:00
Marshall Greenblatt	e6096029c7	Add support for media device discovery and messaging (fixes issue #2900 ) Chromium supports communication with media devices on the local network via the Cast and DIAL protocols. This takes two primary forms: 1. Messaging, where strings representing state information are passed between the client and a dedicated receiver app on the media device. The receiver app communicates directly with an app-specific backend service to retrieve and possibly control media playback. 2. Tab/desktop mirroring, where the media contents are streamed directly from the browser to a generic streaming app on the media device and playback is controlled by the browser. This change adds support for device discovery and messaging (but not mirroring) with functionality exposed via the new CefMediaRouter interface. To test: Navigate to http://tests/media_router in cefclient and follow the on-screen instructions.	2020-03-27 17:27:34 -04:00
Marshall Greenblatt	f96cd1de5e	Add missing //chrome/common:mojo_bindings dependency Fixes the following error: ../../cef/libcef/common/service_manifests/ cef_content_browser_overlay_manifest.cc(15,10): fatal error: 'chrome/common/conflicts/module_event_sink_win.mojom.h' file not found	2020-03-09 11:55:07 -04:00
Vladislav	d9fd476670	Fix OSR crash on window.open with new client (fixes issue #2894 )	2020-03-06 15:07:03 -05:00
Marshall Greenblatt	bc10d1ab8b	Add depot_tools version pinning (see issue #2893 )	2020-03-06 11:44:46 -05:00
Marshall Greenblatt	df7fb8ec6d	Update to Chromium version 80.0.3987.132	2020-03-04 12:57:49 -05:00
Marshall Greenblatt	74f7b0cb38	Update to Chromium version 80.0.3987.122	2020-02-24 17:41:50 -05:00
Marshall Greenblatt	b440f4c949	Fix OSR surface sizing on browser resize (fixes issue #2733 ). This includes the following changes: - Update usage of surface IDs to match the Aura implementation from the RWHVAura/Window classes. - Batch CefBrowserHost::WasResized calls to avoid excessive/unnecessary calls to SynchronizeVisualProperties. - Cache the results of CefRenderHandler::GetViewRect after resize and make RWHVOSR::GetViewBounds the source of truth for all size calculations. - Fix bounds calculations in CefVideoConsumerOSR with GPU enabled. Known issues: - The size passed to OnPaint may be off by 1 pixel in cases where the device scale factor is not 1 and does not divide evenly into the pixel size. This is due to the inexact conversion from integer pixel size to integer logical size for GetViewRect.	2020-02-21 15:11:52 -05:00
Iain Apreotesei	408e48bde6	Windows: Add ARM64 binary distribution support (see issue #2773 )	2020-02-21 15:11:43 -05:00
Marshall Greenblatt	14948082f3	Update to Chromium version 80.0.3987.116	2020-02-18 20:20:02 -05:00