Merge revision 824 changes:

- Add CefZoomHandler interface to support custom zoom handling (issue #733).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1025@826 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

.gitignore

@@ -1,56 +0,0 @@
-*.gypcmd
-*.mk
-*.ncb
-*.opensdf
-*.props
-*.pyc
-*.rules
-*.sdf
-*.sln
-*.sublime-project
-*.sublime-workspace
-*.suo
-*.targets
-*.user
-*.vcproj
-*.vcxproj
-*.vcxproj.filters
-*.vpj
-*.vpw
-*.vpwhistu
-*.vtg
-*.xcodeproj
-*.xcworkspace
-*_proto.xml
-*_proto_cpp.xml
-*~
-!Android.mk
-.*.sw?
-.DS_Store
-.classpath
-.cproject
-.gdb_history
-.gdbinit
-.landmines
-.metadata
-.project
-.pydevproject
-.vscode
-# Settings directory for eclipse
-/.settings
-.checkstyle
-cscope.*
-Session.vim
-tags
-Thumbs.db
-# IDE's
-.vs/
-.kdev4/
-*.kdev4
-# CEF generated directories
-/binary_distrib
-/docs
-# CEF generated files
-/include/cef_config.h
-/include/cef_version.h
-.ccls-cache/

.style.cfg

@@ -1,9 +0,0 @@
-# Copyright (c) 2017 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
-
-# Configuration settings for tools/fix_style.py
-{
-  # Directories containing these path components will be ignored.
-  'ignore_directories': ['yapf'],
-}

.style.yapf

@@ -1,2 +0,0 @@
-[style]
-based_on_style = chromium

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>
@@ -26,10 +24,3 @@ Russell (Rusty) Richards <fe3o4y@gmail.com>
 Brian Power <powerbf.it@gmail.com>
 Corey Lucier <clucier@adobe.com>
 Mihai Tica <mitica@adobe.com>
-Czarek Tomczak <czarek.tomczak@gmail.com>
-Felix Bruns <felixbruns@spotify.com>
-YuTeh Shen <shenyute@gmail.com>
-Andrei Kurushin <ajax16384@gmail.com>
-Gonzo Berman <gberman@factset.com>
-Jakub Trzebiatowski <kuba.trzebiatowski@gmail.com>
-Nishant Kaushik <nishantk@adobe.com>

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -3,10 +3,18 @@
 # below before building CEF. Chromium compatibility information for older CEF
 # revisions is available by viewing this file's change history.
 #
-# Instructions for building CEF are available at:
-# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
+# To configure a specific Chromium URL:
+#   gclient config chromium_url
+#
+# To update to a specific Chromium revision:
+#   gclient sync --revision src@chromium_revision --jobs 8 --force
+#
+# This file is integrated with the CEF Automation Tool. See the
+# tools/automate/automate.README.txt file for more information.
+#
+# For general gclient usage information visit:
+# http://dev.chromium.org/developers/how-tos/get-the-code
 
 {
-  'chromium_checkout': 'refs/tags/100.0.4896.127',
-  'depot_tools_checkout': '32645dfee9'
+  'release_url': 'http://src.chromium.org/svn/releases/18.0.1025.166',
 }

CHROMIUM_UPDATE.txt

@@ -1,66 +0,0 @@
-# The Chromium Embedded Framework (CEF) project is built on top of the Chromium
-# project source tree. When updating Chromium to a new version certain files and
-# patterns should be observed for changes. If changes are detected then the CEF
-# source code or patch files will likely need to be updated.
-#
-# Add `--log-chromium-changes` to the automate-git.py command-line to output
-# the following files in the <download-dir>:
-#
-# * chromium_update_changes.diff
-#   Files in the chromium/src directory that have changed. See the 'files'
-#   section below.
-#
-# * chromium_update_patterns.txt
-#   Files in the chromium/src directory that contain invalid/unexpected
-#   patterns. See the 'patterns' section below. Failure of this step is
-#   considered a fatal error during update.
-#
-# * chromium_update_patches.txt
-#   Output from attempting to update existing Chromium patch files using the
-#   patch_updater.py tool. Failure of this step is considered a fatal error
-#   during update.
-#
-# For complete update instructions see:
-# https://bitbucket.org/chromiumembedded/cef/wiki/ChromiumUpdate.md
-
-{
-  # 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/browser/browser_process.h',
-    'chrome/browser/extensions/api/tabs/tabs_api.*',
-    'chrome/browser/extensions/chrome_component_extension_resource_manager.*',
-    'chrome/browser/extensions/chrome_extension_web_contents_observer.*',
-    'chrome/browser/extensions/component_loader.*',
-    'chrome/browser/extensions/extension_service.*',
-    'chrome/browser/printing/print_view_manager*',
-    'chrome/browser/printing/printing_message_filter*',
-    'chrome/browser/profiles/profile.h',
-    'chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.*',
-    'chrome/common/extensions/api/*_features.json',
-    'chrome/renderer/chrome_content_renderer_client.*',
-    'chrome/renderer/extensions/chrome_extensions_renderer_client.*',
-    'content/browser/renderer_host/render_widget_host_view_base.*',
-    'content/public/browser/content_browser_client.*',
-    'content/public/browser/render_widget_host_view.h',
-    'content/public/browser/storage_partition.h',
-    'content/public/browser/web_contents_delegate.h',
-    'content/public/common/content_features.cc',
-    'content/shell/BUILD.gn',
-    'content/shell/app/*',
-    'content/shell/browser/shell_*',
-    'content/shell/browser/renderer_host/shell_*',
-    'content/shell/common/shell_*',
-    'content/shell/gpu/shell_*',
-    '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
-  # applying patch files.
-  'patterns': [],
-}

CMakeLists.txt.in

@@ -1,236 +0,0 @@
-# Copyright (c) 2014 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.
-
-# OVERVIEW
-#
-# CMake is a cross-platform open-source build system that can generate project
-# files in many different formats. It can be downloaded from
-# http://www.cmake.org or installed via a platform package manager.
-#
-# CMake-generated project formats that have been tested with this CEF binary
-# distribution include:
-#
-# Linux:      Ninja, GCC 7.5.0+, Unix Makefiles
-# MacOS:      Ninja, Xcode 12.2 to 13.0
-# Windows:    Ninja, Visual Studio 2019+
-#
-# 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
-# downloaded from http://martine.github.io/ninja/ or installed via a platform
-# package manager.
-#
-# CMAKE STRUCTURE
-#
-# This CEF binary distribution includes the following CMake files:
-#
-# CMakeLists.txt              Bootstrap that sets up the CMake environment.
-# cmake/*.cmake               CEF configuration files shared by all targets.
-# libcef_dll/CMakeLists.txt   Defines the libcef_dll_wrapper target.
-# tests/*/CMakeLists.txt      Defines the test application target.
-#
-# See the "TODO:" comments below for guidance on how to integrate this CEF
-# binary distribution into a new or existing CMake project.
-#
-# BUILD REQUIREMENTS
-#
-# The below requirements must be met to build this CEF binary distribution.
-#
-# - CMake version 3.19 or newer.
-#
-# - Linux requirements:
-#   Currently supported distributions include Debian 10 (Buster), Ubuntu 18
-#   (Bionic Beaver), and related. Ubuntu 18.04 64-bit with GCC 7.5.0+ is
-#   recommended. Newer versions will likely also work but may not have been
-#   tested.
-#   Required packages include:
-#     build-essential
-#     libgtk3.0-dev     (required by the cefclient target only)
-#
-# - MacOS requirements:
-#   Xcode 12.2 to 13.0 building on MacOS 10.15.4 (Catalina) or newer. Only
-#   64-bit builds are supported. The Xcode command-line tools must also be
-#   installed. Newer Xcode versions may not have been been tested and are not
-#   recommended.
-#
-# - Windows requirements:
-#   Visual Studio 2019 or newer building on Windows 7 or newer. Windows 10
-#   64-bit is recommended. Newer versions will likely also work but may not have
-#   been tested.
-#
-# BUILD EXAMPLES
-#
-# The below commands will generate project files and create a Debug build of all
-# CEF targets using CMake and the platform toolchain.
-#
-# Start by creating and entering the CMake build output directory:
-# > cd path/to/cef_binary_*
-# > mkdir build && cd build
-#
-# To perform a Linux build using a 32-bit CEF binary distribution on a 32-bit
-# Linux platform or a 64-bit CEF binary distribution on a 64-bit Linux platform:
-#   Using Unix Makefiles:
-#     > cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug ..
-#     > make -j4 cefclient cefsimple
-#
-#   Using Ninja:
-#     > cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Debug ..
-#     > ninja cefclient cefsimple
-#
-# To perform a MacOS 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.
-#
-#   Using Ninja:
-#     > 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 ..
-#     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\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 ..
-#     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\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.
-#
-
-# For VS2019 and Xcode 12+ support.
-cmake_minimum_required(VERSION 3.19)
-
-# Only generate Debug and Release configuration types.
-set(CMAKE_CONFIGURATION_TYPES Debug Release)
-
-# Project name.
-# TODO: Change this line to match your project name when you copy this file.
-project(cef)
-
-# Use folders in the resulting project files.
-set_property(GLOBAL PROPERTY OS_FOLDERS ON)
-
-
-#
-# CEF_ROOT setup.
-# This variable must be set to locate the binary distribution.
-# TODO: Choose one of the below examples and comment out the rest.
-#
-
-# Example 1: The current directory contains both the complete binary
-#            distribution and your project.
-# A. Comment in these lines:
-#
-set(CEF_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake")
-
-# Example 2: The binary distribution is in a separate directory from your
-#            project. Locate the binary distribution using the CEF_ROOT CMake
-#            variable.
-# A. Create a directory structure for your project like the following:
-#    myproject/
-#      CMakeLists.txt    <= top-level CMake configuration
-#      mytarget/
-#        CMakeLists.txt  <= CMake configuration for `mytarget`
-#        ... other `mytarget` source files
-# B. Copy this file to "myproject/CMakeLists.txt" as the top-level CMake
-#    configuration.
-# C. Create the target-specific "myproject/mytarget/CMakeLists.txt" file for
-#    your application. See the included cefclient and cefsimple CMakeLists.txt
-#    files as an example.
-# D. Comment in these lines:
-#
-# set(CEF_ROOT "c:/path/to/cef_binary_3.2704.xxxx.gyyyyyyy_windows32")
-# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake")
-
-# Example 3: The binary distribution is in a separate directory from your
-#            project. Locate the binary distribution using the CEF_ROOT
-#            environment variable.
-# A. Create a directory structure for your project like the following:
-#    myproject/
-#      CMakeLists.txt    <= top-level CMake configuration
-#      cmake/
-#        FindCEF.cmake   <= CEF CMake configuration entry point
-#      mytarget/
-#        CMakeLists.txt  <= CMake configuration for `mytarget`
-#        ... other `mytarget` source files
-# B. Copy this file to "myproject/CMakeLists.txt" as the top-level CMake
-#    configuration.
-# C. Copy the cmake/FindCEF.cmake file to "myproject/cmake/FindCEF.cmake".
-# D. Create the target-specific "myproject/mytarget/CMakeLists.txt" file for
-#    your application. See the included cefclient and cefsimple CMakeLists.txt
-#    files as an example.
-# E. Set the CEF_ROOT environment variable before executing CMake. For example:
-#    > set CEF_ROOT=c:\path\to\cef_binary_3.2704.xxxx.gyyyyyyy_windows32
-# F. Comment in these lines:
-#
-# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-
-#
-# Load the CEF configuration.
-#
-
-# Execute FindCEF.cmake which must exist in CMAKE_MODULE_PATH.
-find_package(CEF REQUIRED)
-
-
-#
-# Define CEF-based targets.
-#
-
-# Include the libcef_dll_wrapper target.
-# Comes from the libcef_dll/CMakeLists.txt file in the binary distribution
-# directory.
-add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
-
-# Include application targets.
-# Comes from the <target>/CMakeLists.txt file in the current directory.
-# TODO: Change these lines to match your project target when you copy this file.
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
-  add_subdirectory(tests/cefsimple)
-  add_subdirectory(tests/gtest)
-  add_subdirectory(tests/ceftests)
-endif()
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/cefclient")
-  add_subdirectory(tests/cefclient)
-endif()
-
-# Display configuration settings.
-PRINT_CEF_CONFIG()

LICENSE.txt

@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2020 Marshall A. Greenblatt. Portions Copyright (c)
+// Copyright (c) 2008-2011 Marshall A. Greenblatt. Portions Copyright (c)
 // 2006-2009 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without

README.md

@@ -1,83 +0,0 @@
-The Chromium Embedded Framework (CEF) is a simple framework for embedding Chromium-based browsers in other applications.
-
-# Quick Links
-
-* Project Page - https://bitbucket.org/chromiumembedded/cef
-* Tutorial - https://bitbucket.org/chromiumembedded/cef/wiki/Tutorial
-* General Usage - https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage
-* Master Build Quick-Start - https://bitbucket.org/chromiumembedded/cef/wiki/MasterBuildQuickStart
-* Branches and Building - https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
-* Announcements - https://groups.google.com/forum/#!forum/cef-announce
-* 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
-* Donations - http://www.magpcss.org/ceforum/donate.php
-
-# Introduction
-
-CEF is a BSD-licensed open source project founded by Marshall Greenblatt in 2008 and based on the [Google Chromium](http://www.chromium.org/Home) project. Unlike the Chromium project itself, which focuses mainly on Google Chrome application development, CEF focuses on facilitating embedded browser use cases in third-party applications. CEF insulates the user from the underlying Chromium and Blink code complexity by offering production-quality stable APIs, release branches tracking specific Chromium releases, and binary distributions. Most features in CEF have default implementations that provide rich functionality while requiring little or no integration work from the user. There are currently over 100 million installed instances of CEF around the world embedded in products from a wide range of companies and industries. A partial list of companies and products using CEF is available on the [CEF Wikipedia page](http://en.wikipedia.org/wiki/Chromium_Embedded_Framework#Applications_using_CEF). Some use cases for CEF include:
-
-* Embedding an HTML5-compliant Web browser control in an existing native application.
-* Creating a light-weight native “shell” application that hosts a user interface developed primarily using Web technologies.
-* Rendering Web content “off-screen” in applications that have their own custom drawing frameworks.
-* Acting as a host for automated testing of existing Web properties and applications.
-
-CEF supports a wide range of programming languages and operating systems and can be easily integrated into both new and existing applications. It was designed from the ground up with both performance and ease of use in mind. The base framework includes C and C++ programming interfaces exposed via native libraries that insulate the host application from Chromium and Blink implementation details. It provides close integration between the browser and the host application including support for custom plugins, protocols, JavaScript objects and JavaScript extensions. The host application can optionally control resource loading, navigation, context menus, printing and more, while taking advantage of the same performance and HTML5 technologies available in the Google Chrome Web browser.
-
-Numerous individuals and organizations contribute time and resources to support CEF development, but more involvement from the community is always welcome. This includes support for both the core CEF project and external projects that integrate CEF with additional programming languages and frameworks (see the "External Projects" section below). If you are interested in donating time to help with CEF development please see the "Helping Out" section below. If you are interested in donating money to support general CEF development and infrastructure efforts please visit the [CEF Donations](http://www.magpcss.org/ceforum/donate.php) page.
-
-# Getting Started
-
-Users new to CEF development should start by reading the [Tutorial](https://bitbucket.org/chromiumembedded/cef/wiki/Tutorial) Wiki page for an overview of CEF usage and then proceed to the [GeneralUsage](https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage) Wiki page for a more in-depth discussion or architectural and usage issues. Complete API documentation is available [here](http://magpcss.org/ceforum/apidocs3/). CEF support and related discussion is available on the [CEF Forum](http://www.magpcss.org/ceforum/).
-
-# 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.
-
-# Source Distributions
-
-The CEF project is an extension of the Chromium project. CEF maintains development and release branches that track Chromium branches. CEF source code can be downloaded, built and packaged manually or with automated tools. Visit the [BranchesAndBuilding](https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding) Wiki page for more information.
-
-# External Projects
-
-The base CEF framework includes support for the C and C++ programming languages. Thanks to the hard work of external maintainers CEF can integrate with a number of other programming languages and frameworks. These external projects are not maintained by CEF so please contact the respective project maintainer if you have any questions or issues.
-
-* .Net (CEF3) - https://github.com/cefsharp/CefSharp
-* .Net (CEF1) - https://bitbucket.org/fddima/cefglue
-* .Net/Mono (CEF3) - https://gitlab.com/xiliumhq/chromiumembedded/cefglue
-* Delphi - https://github.com/hgourvest/dcef3
-* Delphi - https://github.com/salvadordf/CEF4Delphi
-* Go - https://github.com/CzarekTomczak/cef2go
-* Java - https://bitbucket.org/chromiumembedded/java-cef
-* Python - http://code.google.com/p/cefpython/
-
-If you're the maintainer of a project not listed above and would like your project listed here please either post to the [CEF Forum](http://www.magpcss.org/ceforum/) or contact Marshall directly.
-
-# Helping Out
-
-CEF is still very much a work in progress. Some ways that you can help out:
-
-\- Vote for issues in the [CEF issue tracker](https://bitbucket.org/chromiumembedded/cef/issues?status=new&status=open) that are important to you. This helps with development prioritization.
-
-\- Report any bugs that you find or feature requests that are important to you. Make sure to first search for existing issues before creating new ones. Please use the [CEF Forum](http://magpcss.org/ceforum) and not the issue tracker for usage questions. Each CEF issue should:
-
-* Include the CEF revision or binary distribution version.
-* Include information about your OS and compiler version.
-* If the issue is a bug please provide detailed reproduction information.
-* If the issue is a feature please describe why the feature is beneficial.
-
-\- Write unit tests for new or existing functionality.
-
-\- Pull requests and patches are welcome. View open issues in the [CEF issue tracker](https://bitbucket.org/chromiumembedded/cef/issues?status=new&status=open) or search for TODO(cef) in the source code for ideas.
-
-If you would like to contribute source code changes to CEF please follow the below guidelines:
-
-\- Create or find an appropriate issue for each distinct bug, feature or change. 
-
-\- Submit a [pull request](https://bitbucket.org/chromiumembedded/cef/wiki/ContributingWithGit) or create a patch with your changes and attach it to the CEF issue. Changes should:
-
-* Be submitted against the current [CEF master branch](https://bitbucket.org/chromiumembedded/cef/src/?at=master) unless explicitly fixing a bug in a CEF release branch.
-* Follow the style of existing CEF source files. In general CEF uses the [Chromium coding style](http://www.chromium.org/developers/coding-style).
-* Include new or modified unit tests as appropriate to the functionality.
-* Not include unnecessary or unrelated changes.

VERSION.in

@@ -1 +0,0 @@
-CEF_MAJOR=3

cef.gyp

@@ -0,0 +1,863 @@
+# Copyright (c) 2011 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.
+
+{
+  'variables': {
+    'pkg-config': 'pkg-config',
+    'chromium_code': 1,
+    'repack_locales_cmd': ['python', 'tools/repack_locales.py'],
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cef',
+  },
+  'conditions': [
+    [ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+      'target_defaults': {
+        # Disable warnings about c++0x compatibility, as some names (such
+        # as nullptr) conflict with upcoming c++0x types.
+        'cflags_cc': ['-Wno-c++0x-compat'],
+      },
+    }],
+  ],
+  'includes': [
+    # Bring in the source file lists.
+    'cef_paths2.gypi',
+   ],
+  'targets': [
+    {
+      'target_name': 'cefclient',
+      'type': 'executable',
+      'mac_bundle': 1,
+      'msvs_guid': '6617FED9-C5D4-4907-BF55-A90062A6683F',
+      'dependencies': [
+        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+        'libcef',
+        'libcef_dll_wrapper',
+      ],
+      'defines': [
+        'USING_CEF_SHARED',
+      ],
+      'include_dirs': [
+        '.',
+        # cefclient includes are relative to the tests directory to make
+        # creation of binary releases easier.
+        'tests'
+      ],
+      'sources': [
+        '<@(includes_common)',
+        '<@(includes_wrapper)',
+        '<@(cefclient_sources_common)',
+      ],
+      'mac_bundle_resources': [
+        '<@(cefclient_bundle_resources_mac)',
+      ],
+      'mac_bundle_resources!': [
+        # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
+        # that automatically sets the correct INFOPLIST_FILE setting and adds
+        # the file to a source group.
+        'tests/cefclient/mac/Info.plist',
+      ],
+      'xcode_settings': {
+        'INFOPLIST_FILE': 'tests/cefclient/mac/Info.plist',
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'variables': {
+            'repack_path': '../tools/grit/grit/format/repack.py',
+          },
+          'actions': [
+            {
+              'action_name': 'repack_locales',
+              'inputs': [
+                'tools/repack_locales.py',
+                # NOTE: Ideally the common command args would be shared
+                # amongst inputs/outputs/action, but the args include shell
+                # variables which need to be passed intact, and command
+                # expansion wants to expand the shell variables. Adding the
+                # explicit quoting here was the only way it seemed to work.
+                '>!@(<(repack_locales_cmd) -i -g \"<(grit_out_dir)\" -s \"<(SHARED_INTERMEDIATE_DIR)\" -x \"<(INTERMEDIATE_DIR)\" <(locales))',
+              ],
+              'outputs': [
+                '>!@(<(repack_locales_cmd) -o -g \"<(grit_out_dir)\" -s \"<(SHARED_INTERMEDIATE_DIR)\" -x \"<(INTERMEDIATE_DIR)\" <(locales))',
+              ],
+              'action': [
+                '<@(repack_locales_cmd)',
+                '-g', '<(grit_out_dir)',
+                '-s', '<(SHARED_INTERMEDIATE_DIR)',
+                '-x', '<(INTERMEDIATE_DIR)',
+                '<@(locales)',
+              ],
+            },
+            {
+              # On Windows chrome.pak will contain only the inspector resources.
+              # Other resources are built into libcef.dll.
+              'action_name': 'repack_resources',
+              'variables': {
+                'pak_inputs': [
+                  '<(grit_out_dir)/devtools_resources.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/repack/chrome.pak',
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/locales',
+              'files': [
+                '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(INTERMEDIATE_DIR)/repack/chrome.pak'
+              ],
+            },
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              # Set /SUBSYSTEM:WINDOWS.
+              'SubSystem': '2',
+              'EntryPointSymbol' : 'wWinMainCRTStartup',
+            },
+          },
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+              '-lshlwapi.lib',
+              '-lrpcrt4.lib',
+              '-lopengl32.lib',
+              '-lglu32.lib',
+            ],
+          },
+          'sources': [
+            '<@(includes_win)',
+            '<@(cefclient_sources_win)',
+          ],
+        }],
+        [ 'OS=="mac"', {
+          'product_name': 'cefclient',
+          'variables': {
+            'repack_path': '../tools/grit/grit/format/repack.py',
+          },
+          'actions': [
+            {
+              'action_name': 'repack_locales',
+              'process_outputs_as_mac_bundle_resources': 1,
+              'inputs': [
+                'tools/repack_locales.py',
+                # NOTE: Ideally the common command args would be shared
+                # amongst inputs/outputs/action, but the args include shell
+                # variables which need to be passed intact, and command
+                # expansion wants to expand the shell variables. Adding the
+                # explicit quoting here was the only way it seemed to work.
+                '>!@(<(repack_locales_cmd) -i -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+              ],
+              'outputs': [
+                '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+              ],
+              'action': [
+                '<@(repack_locales_cmd)',
+                '-g', '<(grit_out_dir)',
+                '-s', '<(SHARED_INTERMEDIATE_DIR)',
+                '-x', '<(INTERMEDIATE_DIR)',
+                '<@(locales)',
+              ],
+            },
+            {
+              'action_name': 'repack_resources',
+              'process_outputs_as_mac_bundle_resources': 1,
+              'variables': {
+                'pak_inputs': [
+                  '<(grit_out_dir)/devtools_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/repack/chrome.pak',
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+          ],
+          'copies': [
+            {
+              # Add library dependencies to the bundle.
+              'destination': '<(PRODUCT_DIR)/cefclient.app/Contents/MacOS/',
+              'files': [
+                '<(PRODUCT_DIR)/libcef.dylib',
+                '<(PRODUCT_DIR)/ffmpegsumo.so',
+              ],
+            },
+            {
+              # Add the WebCore resources to the bundle.
+              'destination': '<(PRODUCT_DIR)/cefclient.app/Contents/',
+              'files': [
+                '../third_party/WebKit/Source/WebCore/Resources/',
+              ],
+            },
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
+              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+            ],
+          },
+          'sources': [
+            '<@(includes_mac)',
+            '<@(cefclient_sources_mac)',
+          ],
+        }],
+        [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'sources': [
+            '<@(includes_linux)',
+            '<@(cefclient_sources_linux)',
+          ],
+          'variables': {
+            'repack_path': '../tools/grit/grit/format/repack.py',
+          },
+          'actions': [
+            {
+              'action_name': 'repack_locales',
+              'inputs': [
+                'tools/repack_locales.py',
+                # NOTE: Ideally the common command args would be shared
+                # amongst inputs/outputs/action, but the args include shell
+                # variables which need to be passed intact, and command
+                # expansion wants to expand the shell variables. Adding the
+                # explicit quoting here was the only way it seemed to work.
+                '>!@(<(repack_locales_cmd) -i -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+              ],
+              'outputs': [
+                '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+              ],
+              'action': [
+                '<@(repack_locales_cmd)',
+                '-g', '<(grit_out_dir)',
+                '-s', '<(SHARED_INTERMEDIATE_DIR)',
+                '-x', '<(INTERMEDIATE_DIR)',
+                '<@(locales)',
+              ],
+            },
+            {
+              'action_name': 'repack_resources',
+              'variables': {
+                'pak_inputs': [
+                  '<(grit_out_dir)/devtools_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/repack/chrome.pak',
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/locales',
+              'files': [
+                '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(INTERMEDIATE_DIR)/repack/chrome.pak'
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)/files',
+              'files': [
+                '<@(cefclient_bundle_resources_linux)',
+              ],
+            },
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'cef_unittests',
+      'type': 'executable',
+      'mac_bundle': 1,
+      'msvs_guid': '8500027C-B11A-11DE-A16E-B80256D89593',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/base/base.gyp:test_support_base',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        'libcef',
+        'libcef_dll_wrapper',
+      ],
+      'sources': [
+        'tests/cefclient/cefclient_switches.cpp',
+        'tests/cefclient/cefclient_switches.h',
+        'tests/unittests/command_line_unittest.cc',
+        'tests/unittests/content_filter_unittest.cc',
+        'tests/unittests/cookie_unittest.cc',
+        'tests/unittests/dom_unittest.cc',
+        'tests/unittests/navigation_unittest.cc',
+        'tests/unittests/request_unittest.cc',
+        'tests/unittests/run_all_unittests.cc',
+        'tests/unittests/scheme_handler_unittest.cc',
+        'tests/unittests/stream_unittest.cc',
+        'tests/unittests/string_unittest.cc',
+        'tests/unittests/storage_unittest.cc',
+        'tests/unittests/test_handler.cc',
+        'tests/unittests/test_handler.h',
+        'tests/unittests/test_suite.cc',
+        'tests/unittests/test_suite.h',
+        'tests/unittests/url_unittest.cc',
+        'tests/unittests/v8_unittest.cc',
+        'tests/unittests/v8_unittest_legacy.cc',
+        'tests/unittests/web_urlrequest_unittest.cc',
+        'tests/unittests/xml_reader_unittest.cc',
+        'tests/unittests/zip_reader_unittest.cc',
+      ],
+      'mac_bundle_resources': [
+        'tests/unittests/mac/unittests.icns',
+        'tests/unittests/mac/English.lproj/InfoPlist.strings',
+        'tests/unittests/mac/English.lproj/MainMenu.xib',
+        'tests/unittests/mac/Info.plist',
+      ],
+      'mac_bundle_resources!': [
+        # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
+        # that automatically sets the correct INFOPLIST_FILE setting and adds
+        # the file to a source group.
+        'tests/unittests/mac/Info.plist',
+      ],
+      'xcode_settings': {
+        'INFOPLIST_FILE': 'tests/unittests/mac/Info.plist',
+      },
+      'include_dirs': [
+        '.',
+      ],
+      'conditions': [
+        [ 'OS=="mac"', {
+          'product_name': 'cef_unittests',
+          'variables': {
+            'repack_path': '../tools/grit/grit/format/repack.py',
+          },
+          'run_as': {
+            'action': ['${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/MacOS/${PRODUCT_NAME}'],
+          },
+          'actions': [
+            {
+              'action_name': 'repack_locales',
+              'process_outputs_as_mac_bundle_resources': 1,
+              'inputs': [
+                'tools/repack_locales.py',
+                # NOTE: Ideally the common command args would be shared
+                # amongst inputs/outputs/action, but the args include shell
+                # variables which need to be passed intact, and command
+                # expansion wants to expand the shell variables. Adding the
+                # explicit quoting here was the only way it seemed to work.
+                '>!@(<(repack_locales_cmd) -i -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+              ],
+              'outputs': [
+                '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+              ],
+              'action': [
+                '<@(repack_locales_cmd)',
+                '-g', '<(grit_out_dir)',
+                '-s', '<(SHARED_INTERMEDIATE_DIR)',
+                '-x', '<(INTERMEDIATE_DIR)',
+                '<@(locales)',
+              ],
+            },
+            {
+              'action_name': 'repack_resources',
+              'process_outputs_as_mac_bundle_resources': 1,
+              'variables': {
+                'pak_inputs': [
+                  '<(grit_out_dir)/devtools_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/repack/chrome.pak',
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+          ],
+          'copies': [
+            {
+              # Add library dependencies to the bundle.
+              'destination': '<(PRODUCT_DIR)/cef_unittests.app/Contents/MacOS/',
+              'files': [
+                '<(PRODUCT_DIR)/libcef.dylib',
+                '<(PRODUCT_DIR)/ffmpegsumo.so',
+              ],
+            },
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
+            ],
+          },
+          'sources': [
+            'tests/unittests/run_all_unittests_mac.mm',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'libcef',
+      'type': 'shared_library',
+      'msvs_guid': 'C13650D5-CF1A-4259-BE45-B1EBA6280E47',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/net/net.gyp:net_resources',
+        '<(DEPTH)/printing/printing.gyp:printing',
+        '<(DEPTH)/sdch/sdch.gyp:sdch',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/bzip2/bzip2.gyp:bzip2',
+        '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+        '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
+        '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+        '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
+        '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
+        '<(DEPTH)/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+        '<(DEPTH)/ui/ui.gyp:gfx_resources',
+        '<(DEPTH)/ui/ui.gyp:ui',
+        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:blob',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
+        'libcef_static',
+      ],
+      'defines': [
+        'BUILDING_CEF_SHARED',
+      ],
+      'include_dirs': [
+        '.',
+      ],
+      # Avoid "RC1102: internal error : too many arguments to RCPP" error by
+      # explicitly specifying a short list of resource include directories.
+      'resource_include_dirs' :  [
+        '.',
+        '..',
+      ],
+      'sources': [
+        '<@(includes_common)',
+        '<@(includes_capi)',
+        '<@(libcef_sources_common)',
+      ],
+      'xcode_settings': {
+        'INSTALL_PATH': '@executable_path',
+        'DYLIB_INSTALL_NAME_BASE': '@executable_path',
+        # The libcef_static target contains ObjC categories. Passing the -ObjC flag
+        # is necessary to properly load them and avoid a "selector not recognized"
+        # runtime error. See http://developer.apple.com/library/mac/#qa/qa1490/_index.html
+        # for more information.
+        'OTHER_LDFLAGS': ['-Wl,-ObjC'],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
+            '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
+            '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
+            '<(DEPTH)/ui/views/views.gyp:views',
+          ],
+          'sources': [
+            '<@(includes_win)',
+            '$(OutDir)/obj/global_intermediate/webkit/webkit_chromium_resources.rc',
+            '$(OutDir)/obj/global_intermediate/webkit/webkit_resources.rc',
+            'libcef_dll/libcef_dll.rc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
+          'msvs_settings': {
+            'VCLinkerTool': {
+              # Generate a PDB symbol file for both Debug and Release builds.
+              'GenerateDebugInformation': 'true',
+            },
+          },
+        }],
+        [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+         'dependencies':[
+            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+          ],
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
+            ],
+          },
+      	}],
+      ],
+    },
+    {
+      'target_name': 'libcef_dll_wrapper',
+      'type': 'static_library',
+      'msvs_guid': 'A9D6DC71-C0DC-4549-AEA0-3B15B44E86A9',
+      'dependencies': [
+        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+        'libcef',
+      ],
+      'defines': [
+        'USING_CEF_SHARED',
+      ],
+      'include_dirs': [
+        '.',
+      ],
+      'sources': [
+        '<@(includes_common)',
+        '<@(includes_capi)',
+        '<@(includes_wrapper)',
+        '<@(libcef_dll_wrapper_sources_common)',
+      ],
+    },
+    {
+      'target_name': 'cef_extra_resources',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd',
+      ],
+      # These resources end up in chrome.pak because they are resources
+      # used by internal pages.  Putting them in a spearate pak file makes
+      # it easier for us to reference them internally.
+      'actions': [
+        {
+          'action_name': 'devtools_resources',
+          # This can't use ../build/grit_action.gypi because the grd file
+          # is generated a build time, so the trick of using grit_info to get
+          # the real inputs/outputs at GYP time isn't possible.
+          'variables': {
+            'grit_cmd': ['python', '../tools/grit/grit.py'],
+            'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd',
+          },
+          'inputs': [
+            '<(grit_grd_file)',
+            '<!@pymod_do_main(grit_info --inputs)',
+          ],
+          'outputs': [
+            '<(grit_out_dir)/grit/devtools_resources.h',
+            '<(grit_out_dir)/devtools_resources.pak',
+            '<(grit_out_dir)/grit/devtools_resources_map.cc',
+            '<(grit_out_dir)/grit/devtools_resources_map.h',
+          ],
+          'action': ['<@(grit_cmd)',
+                     '-i', '<(grit_grd_file)', 'build',
+                     '-o', '<(grit_out_dir)',
+                     '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
+                     '<@(grit_defines)' ],
+          'message': 'Generating resources from <(grit_grd_file)',
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'libcef_static',
+      'type': 'static_library',
+      'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
+      'defines': [
+        'BUILDING_CEF_SHARED',
+      ],
+      'include_dirs': [
+        '.',
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/public',
+        '<(grit_out_dir)',
+      ],
+      'dependencies': [
+        'cef_extra_resources',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/net/net.gyp:net_resources',
+        '<(DEPTH)/printing/printing.gyp:printing',
+        '<(DEPTH)/sdch/sdch.gyp:sdch',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/bzip2/bzip2.gyp:bzip2',
+        '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+        '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
+        '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+        '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
+        '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
+        '<(DEPTH)/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+        '<(DEPTH)/ui/ui.gyp:gfx_resources',
+        '<(DEPTH)/ui/ui.gyp:ui',
+        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:blob',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
+      ],
+      'sources': [
+        '<@(includes_common)',
+        'libcef/browser_appcache_system.cc',
+        'libcef/browser_appcache_system.h',
+        'libcef/browser_database_system.cc',
+        'libcef/browser_database_system.h',
+        'libcef/browser_devtools_agent.cc',
+        'libcef/browser_devtools_agent.h',
+        'libcef/browser_devtools_callargs.cc',
+        'libcef/browser_devtools_callargs.h',
+        'libcef/browser_devtools_client.cc',
+        'libcef/browser_devtools_client.h',
+        'libcef/browser_devtools_scheme_handler.cc',
+        'libcef/browser_devtools_scheme_handler.h',
+        'libcef/browser_file_system.cc',
+        'libcef/browser_file_system.h',
+        'libcef/browser_file_writer.cc',
+        'libcef/browser_file_writer.h',
+        'libcef/browser_impl.cc',
+        'libcef/browser_impl.h',
+        'libcef/browser_navigation_controller.cc',
+        'libcef/browser_navigation_controller.h',
+        'libcef/browser_persistent_cookie_store.cc',
+        'libcef/browser_persistent_cookie_store.h',
+        'libcef/browser_request_context.cc',
+        'libcef/browser_request_context.h',
+        'libcef/browser_request_context_proxy.cc',
+        'libcef/browser_request_context_proxy.h',
+        'libcef/browser_resource_loader_bridge.cc',
+        'libcef/browser_resource_loader_bridge.h',
+        'libcef/browser_settings.cc',
+        'libcef/browser_settings.h',
+        'libcef/browser_socket_stream_bridge.cc',
+        'libcef/browser_socket_stream_bridge.h',
+        'libcef/browser_webcookiejar_impl.cc',
+        'libcef/browser_webcookiejar_impl.h',
+        'libcef/browser_webblobregistry_impl.cc',
+        'libcef/browser_webblobregistry_impl.h',
+        'libcef/browser_webstoragearea_impl.cc',
+        'libcef/browser_webstoragearea_impl.h',
+        'libcef/browser_webstoragenamespace_impl.cc',
+        'libcef/browser_webstoragenamespace_impl.h',
+        'libcef/browser_webkit_glue.cc',
+        'libcef/browser_webkit_glue.h',
+        'libcef/browser_webkit_init.cc',
+        'libcef/browser_webkit_init.h',
+        'libcef/browser_webview_delegate.cc',
+        'libcef/browser_webview_delegate.h',
+        'libcef/browser_zoom_map.cc',
+        'libcef/browser_zoom_map.h',
+        'libcef/cef_context.cc',
+        'libcef/cef_context.h',
+        'libcef/cef_process.cc',
+        'libcef/cef_process.h',
+        'libcef/cef_process_io_thread.cc',
+        'libcef/cef_process_io_thread.h',
+        'libcef/cef_process_sub_thread.cc',
+        'libcef/cef_process_sub_thread.h',
+        'libcef/cef_process_ui_thread.cc',
+        'libcef/cef_process_ui_thread.h',
+        'libcef/cef_string_list.cc',
+        'libcef/cef_string_map.cc',
+        'libcef/cef_string_multimap.cc',
+        'libcef/cef_string_types.cc',
+        'libcef/cef_thread.cc',
+        'libcef/cef_thread.h',
+        'libcef/cef_time.cc',
+        'libcef/cef_time_util.h',
+        'libcef/command_line_impl.cc',
+        'libcef/cookie_manager_impl.cc',
+        'libcef/cookie_manager_impl.h',
+        'libcef/cookie_store_proxy.cc',
+        'libcef/cookie_store_proxy.h',
+        'libcef/drag_data_impl.cc',
+        'libcef/drag_data_impl.h',
+        'libcef/drag_download_file.cc',
+        'libcef/drag_download_file.h',
+        'libcef/drag_download_util.cc',
+        'libcef/drag_download_util.h',
+        'libcef/dom_storage_area.cc',
+        'libcef/dom_storage_area.h',
+        'libcef/dom_storage_common.h',
+        'libcef/dom_storage_context.cc',
+        'libcef/dom_storage_context.h',
+        'libcef/dom_storage_namespace.cc',
+        'libcef/dom_storage_namespace.h',
+        'libcef/dom_document_impl.cc',
+        'libcef/dom_document_impl.h',
+        'libcef/dom_event_impl.cc',
+        'libcef/dom_event_impl.h',
+        'libcef/dom_node_impl.cc',
+        'libcef/dom_node_impl.h',
+        'libcef/download_util.cc',
+        'libcef/download_util.h',
+        'libcef/external_protocol_handler.h',
+        'libcef/http_header_utils.cc',
+        'libcef/http_header_utils.h',
+        'libcef/nplugin_impl.cc',
+        'libcef/origin_whitelist_impl.cc',
+        'libcef/request_impl.cc',
+        'libcef/request_impl.h',
+        'libcef/response_impl.cc',
+        'libcef/response_impl.h',
+        'libcef/scheme_impl.cc',
+        'libcef/simple_clipboard_impl.cc',
+        'libcef/simple_clipboard_impl.h',
+        'libcef/storage_impl.cc',
+        'libcef/stream_impl.cc',
+        'libcef/stream_impl.h',
+        'libcef/task_impl.cc',
+        'libcef/tracker.h',
+        'libcef/url_impl.cc',
+        'libcef/v8_impl.cc',
+        'libcef/v8_impl.h',
+        'libcef/web_plugin_impl.cc',
+        'libcef/web_urlrequest_impl.cc',
+        'libcef/web_urlrequest_impl.h',
+        'libcef/webview_host.cc',
+        'libcef/webview_host.h',
+        'libcef/webwidget_host.cc',
+        'libcef/webwidget_host.h',
+        'libcef/xml_reader_impl.cc',
+        'libcef/xml_reader_impl.h',
+        'libcef/zip_reader_impl.cc',
+        'libcef/zip_reader_impl.h',
+        # DevTools resource IDs generated by grit
+        '<(grit_out_dir)/grit/devtools_resources_map.cc',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
+            '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
+            '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
+            '<(DEPTH)/ui/views/views.gyp:views',
+          ],
+          'sources': [
+            '<@(includes_win)',
+            'libcef/browser_drag_delegate_win.cc',
+            'libcef/browser_drag_delegate_win.h',
+            'libcef/browser_impl_win.cc',
+            'libcef/browser_webkit_glue_win.cc',
+            'libcef/browser_webview_delegate_win.cc',
+            'libcef/cef_process_ui_thread_win.cc',
+            'libcef/external_protocol_handler_win.cc',
+            'libcef/printing/print_settings.cc',
+            'libcef/printing/print_settings.h',
+            'libcef/printing/win_printing_context.cc',
+            'libcef/printing/win_printing_context.h',
+            'libcef/web_drag_source_win.cc',
+            'libcef/web_drag_source_win.h',
+            'libcef/web_drag_utils_win.cc',
+            'libcef/web_drag_utils_win.h',
+            'libcef/web_drop_target_win.cc',
+            'libcef/web_drop_target_win.h',
+            'libcef/webview_host_win.cc',
+            'libcef/webwidget_host_win.cc',
+          ],
+        }],
+        [ 'OS=="mac"', {
+          'sources': [
+            '<@(includes_mac)',
+            'libcef/browser_impl_mac.mm',
+            'libcef/browser_webview_delegate_mac.mm',
+            'libcef/browser_webview_mac.h',
+            'libcef/browser_webview_mac.mm',
+            'libcef/cef_process_ui_thread_mac.mm',
+            'libcef/external_popup_menu_mac.h',
+            'libcef/external_popup_menu_mac.mm',
+            'libcef/external_protocol_handler_mac.mm',
+            'libcef/webview_host_mac.mm',
+            'libcef/webwidget_host_mac.mm',
+            'libcef/web_drag_source_mac.h',
+            'libcef/web_drag_source_mac.mm',
+            'libcef/web_drag_utils_mac.h',
+            'libcef/web_drag_utils_mac.mm',
+            'libcef/web_drop_target_mac.h',
+            'libcef/web_drop_target_mac.mm',
+            # Build necessary Mozilla sources
+            '<(DEPTH)/third_party/mozilla/NSPasteboard+Utils.h',
+            '<(DEPTH)/third_party/mozilla/NSPasteboard+Utils.mm',
+            '<(DEPTH)/third_party/mozilla/NSString+Utils.h',
+            '<(DEPTH)/third_party/mozilla/NSString+Utils.mm',
+            '<(DEPTH)/third_party/mozilla/NSURL+Utils.h',
+            '<(DEPTH)/third_party/mozilla/NSURL+Utils.m',
+          ],
+        }],
+        [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'sources': [
+            '<@(includes_linux)',
+            'libcef/browser_impl_gtk.cc',
+            'libcef/browser_webview_delegate_gtk.cc',
+            'libcef/cef_process_ui_thread_gtk.cc',
+            'libcef/external_protocol_handler_gtk.cc',
+            'libcef/webview_host_gtk.cc',
+            'libcef/webwidget_host_gtk.cc',
+            'libcef/web_drag_source_gtk.cc',
+            'libcef/web_drag_source_gtk.h',
+            'libcef/web_drop_target_gtk.cc',
+            'libcef/web_drop_target_gtk.h',
+          ],
+        }],
+      ],
+    },
+  ]
+}

cef.gypi

@@ -0,0 +1,28 @@
+# Copyright (c) 2009 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.
+
+{
+  'variables': {
+    'conditions': [
+      # Directory for CEF source files.
+      [ 'OS=="win"', {
+        'cef_directory' : '<!(echo %CEF_DIRECTORY%)',
+        # Keep the build output in the CEF directory.
+        'build_dir_prefix': '..\\<!(echo %CEF_DIRECTORY%)\\',
+        # Use SKIA text rendering for transparency support.
+        'enable_skia_text': 1,
+      }, { # OS!="win"
+        'cef_directory' : '<!(echo $CEF_DIRECTORY)',
+      }],
+      [ 'OS=="mac"', {
+        # Don't use the chrome style plugin with CEF.
+        'clang_use_chrome_plugins': 0,
+      }],
+      [ 'OS=="linux"', {
+        # Required for drag and drop helpers.
+        'toolkit_views': 1,
+      }],
+    ]
+  },
+}

cef_create_projects.bat

@@ -1,2 +1,2 @@
 @echo off
-python.bat tools\gclient_hook.py
+..\third_party\python_26\python.exe tools\gclient_hook.py

cef_create_projects.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-python3 tools/gclient_hook.py
+python tools/gclient_hook.py

cef_paths.gypi

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights
+# Copyright (c) 2012 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,814 +8,316 @@
 # by hand. See the translator.README.txt file in the tools directory for
 # more information.
 #
-# $hash=3d75809bdc9a72a0df9df727981f0796b7ddbbc8$
-#
 
 {
   'variables': {
     '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',
-      'include/cef_callback.h',
       'include/cef_client.h',
       'include/cef_command_line.h',
-      'include/cef_context_menu_handler.h',
+      'include/cef_content_filter.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',
       'include/cef_download_handler.h',
-      'include/cef_download_item.h',
       'include/cef_drag_data.h',
       'include/cef_drag_handler.h',
-      'include/cef_extension.h',
-      'include/cef_extension_handler.h',
-      'include/cef_file_util.h',
       'include/cef_find_handler.h',
       'include/cef_focus_handler.h',
       'include/cef_frame.h',
-      'include/cef_frame_handler.h',
-      'include/cef_i18n_util.h',
-      'include/cef_image.h',
       'include/cef_jsdialog_handler.h',
       'include/cef_keyboard_handler.h',
       'include/cef_life_span_handler.h',
       'include/cef_load_handler.h',
-      'include/cef_media_router.h',
-      'include/cef_menu_model.h',
-      'include/cef_menu_model_delegate.h',
-      'include/cef_navigation_entry.h',
+      'include/cef_menu_handler.h',
       'include/cef_origin_whitelist.h',
-      'include/cef_parser.h',
-      'include/cef_path_util.h',
+      'include/cef_permission_handler.h',
       'include/cef_print_handler.h',
-      'include/cef_print_settings.h',
-      'include/cef_process_message.h',
-      'include/cef_process_util.h',
-      'include/cef_registration.h',
+      'include/cef_proxy_handler.h',
       'include/cef_render_handler.h',
-      'include/cef_render_process_handler.h',
       'include/cef_request.h',
-      'include/cef_request_context.h',
-      'include/cef_request_context_handler.h',
       'include/cef_request_handler.h',
-      'include/cef_resource_bundle.h',
       'include/cef_resource_bundle_handler.h',
-      'include/cef_resource_handler.h',
-      'include/cef_resource_request_handler.h',
       'include/cef_response.h',
-      'include/cef_response_filter.h',
       'include/cef_scheme.h',
-      'include/cef_server.h',
-      'include/cef_ssl_info.h',
-      'include/cef_ssl_status.h',
+      'include/cef_storage.h',
       'include/cef_stream.h',
-      'include/cef_string_visitor.h',
       'include/cef_task.h',
-      'include/cef_thread.h',
-      'include/cef_trace.h',
-      'include/cef_urlrequest.h',
+      'include/cef_url.h',
       'include/cef_v8.h',
-      'include/cef_values.h',
-      'include/cef_waitable_event.h',
-      'include/cef_x509_certificate.h',
+      'include/cef_v8context_handler.h',
+      'include/cef_web_plugin.h',
+      'include/cef_web_urlrequest.h',
       'include/cef_xml_reader.h',
       'include/cef_zip_reader.h',
-      'include/test/cef_test_helpers.h',
-      'include/test/cef_translator_test.h',
-      'include/views/cef_box_layout.h',
-      'include/views/cef_browser_view.h',
-      'include/views/cef_browser_view_delegate.h',
-      'include/views/cef_button.h',
-      'include/views/cef_button_delegate.h',
-      'include/views/cef_display.h',
-      'include/views/cef_fill_layout.h',
-      'include/views/cef_label_button.h',
-      'include/views/cef_layout.h',
-      'include/views/cef_menu_button.h',
-      'include/views/cef_menu_button_delegate.h',
-      'include/views/cef_overlay_controller.h',
-      'include/views/cef_panel.h',
-      'include/views/cef_panel_delegate.h',
-      'include/views/cef_scroll_view.h',
-      'include/views/cef_textfield.h',
-      'include/views/cef_textfield_delegate.h',
-      'include/views/cef_view.h',
-      'include/views/cef_view_delegate.h',
-      'include/views/cef_window.h',
-      'include/views/cef_window_delegate.h',
+      'include/cef_zoom_handler.h',
     ],
     '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',
-      'include/capi/cef_callback_capi.h',
       'include/capi/cef_client_capi.h',
       'include/capi/cef_command_line_capi.h',
-      'include/capi/cef_context_menu_handler_capi.h',
+      'include/capi/cef_content_filter_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',
       'include/capi/cef_download_handler_capi.h',
-      'include/capi/cef_download_item_capi.h',
       'include/capi/cef_drag_data_capi.h',
       'include/capi/cef_drag_handler_capi.h',
-      'include/capi/cef_extension_capi.h',
-      'include/capi/cef_extension_handler_capi.h',
-      'include/capi/cef_file_util_capi.h',
       'include/capi/cef_find_handler_capi.h',
       'include/capi/cef_focus_handler_capi.h',
       'include/capi/cef_frame_capi.h',
-      'include/capi/cef_frame_handler_capi.h',
-      'include/capi/cef_i18n_util_capi.h',
-      'include/capi/cef_image_capi.h',
       'include/capi/cef_jsdialog_handler_capi.h',
       'include/capi/cef_keyboard_handler_capi.h',
       'include/capi/cef_life_span_handler_capi.h',
       'include/capi/cef_load_handler_capi.h',
-      'include/capi/cef_media_router_capi.h',
-      'include/capi/cef_menu_model_capi.h',
-      'include/capi/cef_menu_model_delegate_capi.h',
-      'include/capi/cef_navigation_entry_capi.h',
+      'include/capi/cef_menu_handler_capi.h',
       'include/capi/cef_origin_whitelist_capi.h',
-      'include/capi/cef_parser_capi.h',
-      'include/capi/cef_path_util_capi.h',
+      'include/capi/cef_permission_handler_capi.h',
       'include/capi/cef_print_handler_capi.h',
-      'include/capi/cef_print_settings_capi.h',
-      'include/capi/cef_process_message_capi.h',
-      'include/capi/cef_process_util_capi.h',
-      'include/capi/cef_registration_capi.h',
+      'include/capi/cef_proxy_handler_capi.h',
       'include/capi/cef_render_handler_capi.h',
-      'include/capi/cef_render_process_handler_capi.h',
       'include/capi/cef_request_capi.h',
-      'include/capi/cef_request_context_capi.h',
-      'include/capi/cef_request_context_handler_capi.h',
       'include/capi/cef_request_handler_capi.h',
-      'include/capi/cef_resource_bundle_capi.h',
       'include/capi/cef_resource_bundle_handler_capi.h',
-      'include/capi/cef_resource_handler_capi.h',
-      'include/capi/cef_resource_request_handler_capi.h',
       'include/capi/cef_response_capi.h',
-      'include/capi/cef_response_filter_capi.h',
       'include/capi/cef_scheme_capi.h',
-      'include/capi/cef_server_capi.h',
-      'include/capi/cef_ssl_info_capi.h',
-      'include/capi/cef_ssl_status_capi.h',
+      'include/capi/cef_storage_capi.h',
       'include/capi/cef_stream_capi.h',
-      'include/capi/cef_string_visitor_capi.h',
       'include/capi/cef_task_capi.h',
-      'include/capi/cef_thread_capi.h',
-      'include/capi/cef_trace_capi.h',
-      'include/capi/cef_urlrequest_capi.h',
+      'include/capi/cef_url_capi.h',
       'include/capi/cef_v8_capi.h',
-      'include/capi/cef_values_capi.h',
-      'include/capi/cef_waitable_event_capi.h',
-      'include/capi/cef_x509_certificate_capi.h',
+      'include/capi/cef_v8context_handler_capi.h',
+      'include/capi/cef_web_plugin_capi.h',
+      'include/capi/cef_web_urlrequest_capi.h',
       'include/capi/cef_xml_reader_capi.h',
       'include/capi/cef_zip_reader_capi.h',
-      'include/capi/test/cef_test_helpers_capi.h',
-      'include/capi/test/cef_translator_test_capi.h',
-      'include/capi/views/cef_box_layout_capi.h',
-      'include/capi/views/cef_browser_view_capi.h',
-      'include/capi/views/cef_browser_view_delegate_capi.h',
-      'include/capi/views/cef_button_capi.h',
-      'include/capi/views/cef_button_delegate_capi.h',
-      'include/capi/views/cef_display_capi.h',
-      'include/capi/views/cef_fill_layout_capi.h',
-      'include/capi/views/cef_label_button_capi.h',
-      'include/capi/views/cef_layout_capi.h',
-      'include/capi/views/cef_menu_button_capi.h',
-      'include/capi/views/cef_menu_button_delegate_capi.h',
-      'include/capi/views/cef_overlay_controller_capi.h',
-      'include/capi/views/cef_panel_capi.h',
-      'include/capi/views/cef_panel_delegate_capi.h',
-      'include/capi/views/cef_scroll_view_capi.h',
-      'include/capi/views/cef_textfield_capi.h',
-      'include/capi/views/cef_textfield_delegate_capi.h',
-      'include/capi/views/cef_view_capi.h',
-      'include/capi/views/cef_view_delegate_capi.h',
-      'include/capi/views/cef_window_capi.h',
-      'include/capi/views/cef_window_delegate_capi.h',
+      'include/capi/cef_zoom_handler_capi.h',
     ],
     'autogen_library_side': [
-      'libcef_dll/ctocpp/accessibility_handler_ctocpp.cc',
-      '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',
-      'libcef_dll/cpptoc/before_download_callback_cpptoc.h',
-      'libcef_dll/cpptoc/binary_value_cpptoc.cc',
-      'libcef_dll/cpptoc/binary_value_cpptoc.h',
-      'libcef_dll/cpptoc/views/box_layout_cpptoc.cc',
-      'libcef_dll/cpptoc/views/box_layout_cpptoc.h',
       'libcef_dll/cpptoc/browser_cpptoc.cc',
       'libcef_dll/cpptoc/browser_cpptoc.h',
-      'libcef_dll/cpptoc/browser_host_cpptoc.cc',
-      'libcef_dll/cpptoc/browser_host_cpptoc.h',
-      'libcef_dll/ctocpp/browser_process_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/browser_process_handler_ctocpp.h',
-      'libcef_dll/cpptoc/views/browser_view_cpptoc.cc',
-      'libcef_dll/cpptoc/views/browser_view_cpptoc.h',
-      'libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h',
-      'libcef_dll/cpptoc/views/button_cpptoc.cc',
-      'libcef_dll/cpptoc/views/button_cpptoc.h',
-      'libcef_dll/ctocpp/views/button_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/button_delegate_ctocpp.h',
-      'libcef_dll/cpptoc/callback_cpptoc.cc',
-      'libcef_dll/cpptoc/callback_cpptoc.h',
       'libcef_dll/ctocpp/client_ctocpp.cc',
       'libcef_dll/ctocpp/client_ctocpp.h',
       'libcef_dll/cpptoc/command_line_cpptoc.cc',
       'libcef_dll/cpptoc/command_line_cpptoc.h',
-      'libcef_dll/ctocpp/completion_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/completion_callback_ctocpp.h',
-      'libcef_dll/ctocpp/context_menu_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/context_menu_handler_ctocpp.h',
-      'libcef_dll/cpptoc/context_menu_params_cpptoc.cc',
-      'libcef_dll/cpptoc/context_menu_params_cpptoc.h',
-      'libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc',
-      'libcef_dll/ctocpp/cookie_access_filter_ctocpp.h',
+      'libcef_dll/ctocpp/content_filter_ctocpp.cc',
+      'libcef_dll/ctocpp/content_filter_ctocpp.h',
       'libcef_dll/cpptoc/cookie_manager_cpptoc.cc',
       'libcef_dll/cpptoc/cookie_manager_cpptoc.h',
       'libcef_dll/ctocpp/cookie_visitor_ctocpp.cc',
       'libcef_dll/ctocpp/cookie_visitor_ctocpp.h',
       'libcef_dll/cpptoc/domdocument_cpptoc.cc',
       'libcef_dll/cpptoc/domdocument_cpptoc.h',
+      'libcef_dll/cpptoc/domevent_cpptoc.cc',
+      'libcef_dll/cpptoc/domevent_cpptoc.h',
+      'libcef_dll/ctocpp/domevent_listener_ctocpp.cc',
+      'libcef_dll/ctocpp/domevent_listener_ctocpp.h',
       'libcef_dll/cpptoc/domnode_cpptoc.cc',
       'libcef_dll/cpptoc/domnode_cpptoc.h',
       'libcef_dll/ctocpp/domvisitor_ctocpp.cc',
       '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',
-      'libcef_dll/cpptoc/dictionary_value_cpptoc.h',
-      'libcef_dll/cpptoc/views/display_cpptoc.cc',
-      'libcef_dll/cpptoc/views/display_cpptoc.h',
       'libcef_dll/ctocpp/display_handler_ctocpp.cc',
       'libcef_dll/ctocpp/display_handler_ctocpp.h',
       'libcef_dll/ctocpp/download_handler_ctocpp.cc',
       'libcef_dll/ctocpp/download_handler_ctocpp.h',
-      'libcef_dll/ctocpp/download_image_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/download_image_callback_ctocpp.h',
-      'libcef_dll/cpptoc/download_item_cpptoc.cc',
-      'libcef_dll/cpptoc/download_item_cpptoc.h',
-      'libcef_dll/cpptoc/download_item_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/download_item_callback_cpptoc.h',
       'libcef_dll/cpptoc/drag_data_cpptoc.cc',
       'libcef_dll/cpptoc/drag_data_cpptoc.h',
       'libcef_dll/ctocpp/drag_handler_ctocpp.cc',
       'libcef_dll/ctocpp/drag_handler_ctocpp.h',
-      'libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/end_tracing_callback_ctocpp.h',
-      'libcef_dll/cpptoc/extension_cpptoc.cc',
-      'libcef_dll/cpptoc/extension_cpptoc.h',
-      'libcef_dll/ctocpp/extension_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/extension_handler_ctocpp.h',
-      'libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/file_dialog_callback_cpptoc.h',
-      'libcef_dll/cpptoc/views/fill_layout_cpptoc.cc',
-      'libcef_dll/cpptoc/views/fill_layout_cpptoc.h',
       'libcef_dll/ctocpp/find_handler_ctocpp.cc',
       'libcef_dll/ctocpp/find_handler_ctocpp.h',
       'libcef_dll/ctocpp/focus_handler_ctocpp.cc',
       'libcef_dll/ctocpp/focus_handler_ctocpp.h',
       'libcef_dll/cpptoc/frame_cpptoc.cc',
       'libcef_dll/cpptoc/frame_cpptoc.h',
-      'libcef_dll/ctocpp/frame_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/frame_handler_ctocpp.h',
-      'libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h',
-      'libcef_dll/cpptoc/image_cpptoc.cc',
-      'libcef_dll/cpptoc/image_cpptoc.h',
-      'libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/jsdialog_callback_cpptoc.h',
       'libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc',
       'libcef_dll/ctocpp/jsdialog_handler_ctocpp.h',
       'libcef_dll/ctocpp/keyboard_handler_ctocpp.cc',
       'libcef_dll/ctocpp/keyboard_handler_ctocpp.h',
-      'libcef_dll/cpptoc/views/label_button_cpptoc.cc',
-      'libcef_dll/cpptoc/views/label_button_cpptoc.h',
-      'libcef_dll/cpptoc/views/layout_cpptoc.cc',
-      'libcef_dll/cpptoc/views/layout_cpptoc.h',
       'libcef_dll/ctocpp/life_span_handler_ctocpp.cc',
       'libcef_dll/ctocpp/life_span_handler_ctocpp.h',
-      'libcef_dll/cpptoc/list_value_cpptoc.cc',
-      'libcef_dll/cpptoc/list_value_cpptoc.h',
       'libcef_dll/ctocpp/load_handler_ctocpp.cc',
       'libcef_dll/ctocpp/load_handler_ctocpp.h',
-      'libcef_dll/ctocpp/media_observer_ctocpp.cc',
-      'libcef_dll/ctocpp/media_observer_ctocpp.h',
-      'libcef_dll/cpptoc/media_route_cpptoc.cc',
-      'libcef_dll/cpptoc/media_route_cpptoc.h',
-      'libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/media_route_create_callback_ctocpp.h',
-      'libcef_dll/cpptoc/media_router_cpptoc.cc',
-      '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',
-      'libcef_dll/cpptoc/views/menu_button_cpptoc.h',
-      'libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h',
-      'libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc',
-      'libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h',
-      'libcef_dll/cpptoc/menu_model_cpptoc.cc',
-      'libcef_dll/cpptoc/menu_model_cpptoc.h',
-      'libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/menu_model_delegate_ctocpp.h',
-      'libcef_dll/cpptoc/navigation_entry_cpptoc.cc',
-      'libcef_dll/cpptoc/navigation_entry_cpptoc.h',
-      'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc',
-      'libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h',
-      'libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc',
-      'libcef_dll/cpptoc/views/overlay_controller_cpptoc.h',
-      'libcef_dll/cpptoc/views/panel_cpptoc.cc',
-      'libcef_dll/cpptoc/views/panel_cpptoc.h',
-      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/panel_delegate_ctocpp.h',
-      'libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/pdf_print_callback_ctocpp.h',
+      'libcef_dll/ctocpp/menu_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/menu_handler_ctocpp.h',
+      'libcef_dll/ctocpp/permission_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/permission_handler_ctocpp.h',
       'libcef_dll/cpptoc/post_data_cpptoc.cc',
       'libcef_dll/cpptoc/post_data_cpptoc.h',
       'libcef_dll/cpptoc/post_data_element_cpptoc.cc',
       'libcef_dll/cpptoc/post_data_element_cpptoc.h',
-      'libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/print_dialog_callback_cpptoc.h',
       'libcef_dll/ctocpp/print_handler_ctocpp.cc',
       'libcef_dll/ctocpp/print_handler_ctocpp.h',
-      'libcef_dll/cpptoc/print_job_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/print_job_callback_cpptoc.h',
-      'libcef_dll/cpptoc/print_settings_cpptoc.cc',
-      'libcef_dll/cpptoc/print_settings_cpptoc.h',
-      'libcef_dll/cpptoc/process_message_cpptoc.cc',
-      'libcef_dll/cpptoc/process_message_cpptoc.h',
+      'libcef_dll/ctocpp/proxy_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/proxy_handler_ctocpp.h',
       'libcef_dll/ctocpp/read_handler_ctocpp.cc',
       'libcef_dll/ctocpp/read_handler_ctocpp.h',
-      'libcef_dll/cpptoc/registration_cpptoc.cc',
-      'libcef_dll/cpptoc/registration_cpptoc.h',
       'libcef_dll/ctocpp/render_handler_ctocpp.cc',
       'libcef_dll/ctocpp/render_handler_ctocpp.h',
-      'libcef_dll/ctocpp/render_process_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/render_process_handler_ctocpp.h',
       'libcef_dll/cpptoc/request_cpptoc.cc',
       'libcef_dll/cpptoc/request_cpptoc.h',
-      'libcef_dll/cpptoc/request_context_cpptoc.cc',
-      'libcef_dll/cpptoc/request_context_cpptoc.h',
-      'libcef_dll/ctocpp/request_context_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/request_context_handler_ctocpp.h',
       'libcef_dll/ctocpp/request_handler_ctocpp.cc',
       'libcef_dll/ctocpp/request_handler_ctocpp.h',
-      'libcef_dll/ctocpp/resolve_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/resolve_callback_ctocpp.h',
-      'libcef_dll/cpptoc/resource_bundle_cpptoc.cc',
-      'libcef_dll/cpptoc/resource_bundle_cpptoc.h',
       'libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc',
       'libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h',
-      'libcef_dll/ctocpp/resource_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/resource_handler_ctocpp.h',
-      'libcef_dll/cpptoc/resource_read_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/resource_read_callback_cpptoc.h',
-      'libcef_dll/ctocpp/resource_request_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/resource_request_handler_ctocpp.h',
-      'libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/resource_skip_callback_cpptoc.h',
       'libcef_dll/cpptoc/response_cpptoc.cc',
       'libcef_dll/cpptoc/response_cpptoc.h',
-      'libcef_dll/ctocpp/response_filter_ctocpp.cc',
-      'libcef_dll/ctocpp/response_filter_ctocpp.h',
-      'libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h',
-      'libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h',
-      'libcef_dll/cpptoc/sslinfo_cpptoc.cc',
-      'libcef_dll/cpptoc/sslinfo_cpptoc.h',
-      'libcef_dll/cpptoc/sslstatus_cpptoc.cc',
-      'libcef_dll/cpptoc/sslstatus_cpptoc.h',
+      'libcef_dll/ctocpp/scheme_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/scheme_handler_ctocpp.h',
+      'libcef_dll/cpptoc/scheme_handler_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h',
       'libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc',
       'libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h',
-      'libcef_dll/cpptoc/scheme_registrar_cpptoc.cc',
-      'libcef_dll/cpptoc/scheme_registrar_cpptoc.h',
-      'libcef_dll/cpptoc/views/scroll_view_cpptoc.cc',
-      'libcef_dll/cpptoc/views/scroll_view_cpptoc.h',
-      'libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h',
-      'libcef_dll/cpptoc/server_cpptoc.cc',
-      'libcef_dll/cpptoc/server_cpptoc.h',
-      'libcef_dll/ctocpp/server_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/server_handler_ctocpp.h',
-      'libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/set_cookie_callback_ctocpp.h',
+      'libcef_dll/ctocpp/storage_visitor_ctocpp.cc',
+      'libcef_dll/ctocpp/storage_visitor_ctocpp.h',
       'libcef_dll/cpptoc/stream_reader_cpptoc.cc',
       'libcef_dll/cpptoc/stream_reader_cpptoc.h',
       'libcef_dll/cpptoc/stream_writer_cpptoc.cc',
       'libcef_dll/cpptoc/stream_writer_cpptoc.h',
-      'libcef_dll/ctocpp/string_visitor_ctocpp.cc',
-      'libcef_dll/ctocpp/string_visitor_ctocpp.h',
       'libcef_dll/ctocpp/task_ctocpp.cc',
       'libcef_dll/ctocpp/task_ctocpp.h',
-      'libcef_dll/cpptoc/task_runner_cpptoc.cc',
-      'libcef_dll/cpptoc/task_runner_cpptoc.h',
-      'libcef_dll/cpptoc/views/textfield_cpptoc.cc',
-      'libcef_dll/cpptoc/views/textfield_cpptoc.h',
-      'libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h',
-      'libcef_dll/cpptoc/thread_cpptoc.cc',
-      'libcef_dll/cpptoc/thread_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_cpptoc.h',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h',
-      'libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h',
-      'libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h',
-      'libcef_dll/cpptoc/urlrequest_cpptoc.cc',
-      'libcef_dll/cpptoc/urlrequest_cpptoc.h',
-      'libcef_dll/ctocpp/urlrequest_client_ctocpp.cc',
-      'libcef_dll/ctocpp/urlrequest_client_ctocpp.h',
       'libcef_dll/ctocpp/v8accessor_ctocpp.cc',
       'libcef_dll/ctocpp/v8accessor_ctocpp.h',
-      'libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h',
       'libcef_dll/cpptoc/v8context_cpptoc.cc',
       'libcef_dll/cpptoc/v8context_cpptoc.h',
+      'libcef_dll/ctocpp/v8context_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/v8context_handler_ctocpp.h',
       'libcef_dll/cpptoc/v8exception_cpptoc.cc',
       'libcef_dll/cpptoc/v8exception_cpptoc.h',
       'libcef_dll/ctocpp/v8handler_ctocpp.cc',
       'libcef_dll/ctocpp/v8handler_ctocpp.h',
-      'libcef_dll/ctocpp/v8interceptor_ctocpp.cc',
-      'libcef_dll/ctocpp/v8interceptor_ctocpp.h',
-      'libcef_dll/cpptoc/v8stack_frame_cpptoc.cc',
-      'libcef_dll/cpptoc/v8stack_frame_cpptoc.h',
-      'libcef_dll/cpptoc/v8stack_trace_cpptoc.cc',
-      'libcef_dll/cpptoc/v8stack_trace_cpptoc.h',
       'libcef_dll/cpptoc/v8value_cpptoc.cc',
       'libcef_dll/cpptoc/v8value_cpptoc.h',
-      'libcef_dll/cpptoc/value_cpptoc.cc',
-      'libcef_dll/cpptoc/value_cpptoc.h',
-      'libcef_dll/cpptoc/views/view_cpptoc.cc',
-      'libcef_dll/cpptoc/views/view_cpptoc.h',
-      'libcef_dll/ctocpp/views/view_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/view_delegate_ctocpp.h',
-      'libcef_dll/cpptoc/waitable_event_cpptoc.cc',
-      'libcef_dll/cpptoc/waitable_event_cpptoc.h',
-      'libcef_dll/cpptoc/views/window_cpptoc.cc',
-      'libcef_dll/cpptoc/views/window_cpptoc.h',
-      'libcef_dll/ctocpp/views/window_delegate_ctocpp.cc',
-      'libcef_dll/ctocpp/views/window_delegate_ctocpp.h',
+      'libcef_dll/cpptoc/web_plugin_info_cpptoc.cc',
+      'libcef_dll/cpptoc/web_plugin_info_cpptoc.h',
+      'libcef_dll/cpptoc/web_urlrequest_cpptoc.cc',
+      'libcef_dll/cpptoc/web_urlrequest_cpptoc.h',
+      'libcef_dll/ctocpp/web_urlrequest_client_ctocpp.cc',
+      'libcef_dll/ctocpp/web_urlrequest_client_ctocpp.h',
       'libcef_dll/ctocpp/write_handler_ctocpp.cc',
       'libcef_dll/ctocpp/write_handler_ctocpp.h',
-      'libcef_dll/cpptoc/x509cert_principal_cpptoc.cc',
-      'libcef_dll/cpptoc/x509cert_principal_cpptoc.h',
-      'libcef_dll/cpptoc/x509certificate_cpptoc.cc',
-      'libcef_dll/cpptoc/x509certificate_cpptoc.h',
       'libcef_dll/cpptoc/xml_reader_cpptoc.cc',
       'libcef_dll/cpptoc/xml_reader_cpptoc.h',
       'libcef_dll/cpptoc/zip_reader_cpptoc.cc',
       'libcef_dll/cpptoc/zip_reader_cpptoc.h',
+      'libcef_dll/ctocpp/zoom_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/zoom_handler_ctocpp.h',
     ],
     'autogen_client_side': [
-      'libcef_dll/cpptoc/accessibility_handler_cpptoc.cc',
-      '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',
-      'libcef_dll/ctocpp/before_download_callback_ctocpp.h',
-      'libcef_dll/ctocpp/binary_value_ctocpp.cc',
-      'libcef_dll/ctocpp/binary_value_ctocpp.h',
-      'libcef_dll/ctocpp/views/box_layout_ctocpp.cc',
-      'libcef_dll/ctocpp/views/box_layout_ctocpp.h',
       'libcef_dll/ctocpp/browser_ctocpp.cc',
       'libcef_dll/ctocpp/browser_ctocpp.h',
-      'libcef_dll/ctocpp/browser_host_ctocpp.cc',
-      'libcef_dll/ctocpp/browser_host_ctocpp.h',
-      'libcef_dll/cpptoc/browser_process_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/browser_process_handler_cpptoc.h',
-      'libcef_dll/ctocpp/views/browser_view_ctocpp.cc',
-      'libcef_dll/ctocpp/views/browser_view_ctocpp.h',
-      'libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h',
-      'libcef_dll/ctocpp/views/button_ctocpp.cc',
-      'libcef_dll/ctocpp/views/button_ctocpp.h',
-      'libcef_dll/cpptoc/views/button_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/button_delegate_cpptoc.h',
-      'libcef_dll/ctocpp/callback_ctocpp.cc',
-      'libcef_dll/ctocpp/callback_ctocpp.h',
       'libcef_dll/cpptoc/client_cpptoc.cc',
       'libcef_dll/cpptoc/client_cpptoc.h',
       'libcef_dll/ctocpp/command_line_ctocpp.cc',
       'libcef_dll/ctocpp/command_line_ctocpp.h',
-      'libcef_dll/cpptoc/completion_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/completion_callback_cpptoc.h',
-      'libcef_dll/cpptoc/context_menu_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/context_menu_handler_cpptoc.h',
-      'libcef_dll/ctocpp/context_menu_params_ctocpp.cc',
-      'libcef_dll/ctocpp/context_menu_params_ctocpp.h',
-      'libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc',
-      'libcef_dll/cpptoc/cookie_access_filter_cpptoc.h',
+      'libcef_dll/cpptoc/content_filter_cpptoc.cc',
+      'libcef_dll/cpptoc/content_filter_cpptoc.h',
       'libcef_dll/ctocpp/cookie_manager_ctocpp.cc',
       'libcef_dll/ctocpp/cookie_manager_ctocpp.h',
       'libcef_dll/cpptoc/cookie_visitor_cpptoc.cc',
       'libcef_dll/cpptoc/cookie_visitor_cpptoc.h',
       'libcef_dll/ctocpp/domdocument_ctocpp.cc',
       'libcef_dll/ctocpp/domdocument_ctocpp.h',
+      'libcef_dll/ctocpp/domevent_ctocpp.cc',
+      'libcef_dll/ctocpp/domevent_ctocpp.h',
+      'libcef_dll/cpptoc/domevent_listener_cpptoc.cc',
+      'libcef_dll/cpptoc/domevent_listener_cpptoc.h',
       'libcef_dll/ctocpp/domnode_ctocpp.cc',
       'libcef_dll/ctocpp/domnode_ctocpp.h',
       'libcef_dll/cpptoc/domvisitor_cpptoc.cc',
       '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',
-      'libcef_dll/ctocpp/dictionary_value_ctocpp.h',
-      'libcef_dll/ctocpp/views/display_ctocpp.cc',
-      'libcef_dll/ctocpp/views/display_ctocpp.h',
       'libcef_dll/cpptoc/display_handler_cpptoc.cc',
       'libcef_dll/cpptoc/display_handler_cpptoc.h',
       'libcef_dll/cpptoc/download_handler_cpptoc.cc',
       'libcef_dll/cpptoc/download_handler_cpptoc.h',
-      'libcef_dll/cpptoc/download_image_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/download_image_callback_cpptoc.h',
-      'libcef_dll/ctocpp/download_item_ctocpp.cc',
-      'libcef_dll/ctocpp/download_item_ctocpp.h',
-      'libcef_dll/ctocpp/download_item_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/download_item_callback_ctocpp.h',
       'libcef_dll/ctocpp/drag_data_ctocpp.cc',
       'libcef_dll/ctocpp/drag_data_ctocpp.h',
       'libcef_dll/cpptoc/drag_handler_cpptoc.cc',
       'libcef_dll/cpptoc/drag_handler_cpptoc.h',
-      'libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/end_tracing_callback_cpptoc.h',
-      'libcef_dll/ctocpp/extension_ctocpp.cc',
-      'libcef_dll/ctocpp/extension_ctocpp.h',
-      'libcef_dll/cpptoc/extension_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/extension_handler_cpptoc.h',
-      'libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/file_dialog_callback_ctocpp.h',
-      'libcef_dll/ctocpp/views/fill_layout_ctocpp.cc',
-      'libcef_dll/ctocpp/views/fill_layout_ctocpp.h',
       'libcef_dll/cpptoc/find_handler_cpptoc.cc',
       'libcef_dll/cpptoc/find_handler_cpptoc.h',
       'libcef_dll/cpptoc/focus_handler_cpptoc.cc',
       'libcef_dll/cpptoc/focus_handler_cpptoc.h',
       'libcef_dll/ctocpp/frame_ctocpp.cc',
       'libcef_dll/ctocpp/frame_ctocpp.h',
-      'libcef_dll/cpptoc/frame_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/frame_handler_cpptoc.h',
-      'libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h',
-      'libcef_dll/ctocpp/image_ctocpp.cc',
-      'libcef_dll/ctocpp/image_ctocpp.h',
-      'libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/jsdialog_callback_ctocpp.h',
       'libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc',
       'libcef_dll/cpptoc/jsdialog_handler_cpptoc.h',
       'libcef_dll/cpptoc/keyboard_handler_cpptoc.cc',
       'libcef_dll/cpptoc/keyboard_handler_cpptoc.h',
-      'libcef_dll/ctocpp/views/label_button_ctocpp.cc',
-      'libcef_dll/ctocpp/views/label_button_ctocpp.h',
-      'libcef_dll/ctocpp/views/layout_ctocpp.cc',
-      'libcef_dll/ctocpp/views/layout_ctocpp.h',
       'libcef_dll/cpptoc/life_span_handler_cpptoc.cc',
       'libcef_dll/cpptoc/life_span_handler_cpptoc.h',
-      'libcef_dll/ctocpp/list_value_ctocpp.cc',
-      'libcef_dll/ctocpp/list_value_ctocpp.h',
       'libcef_dll/cpptoc/load_handler_cpptoc.cc',
       'libcef_dll/cpptoc/load_handler_cpptoc.h',
-      'libcef_dll/cpptoc/media_observer_cpptoc.cc',
-      'libcef_dll/cpptoc/media_observer_cpptoc.h',
-      'libcef_dll/ctocpp/media_route_ctocpp.cc',
-      'libcef_dll/ctocpp/media_route_ctocpp.h',
-      'libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/media_route_create_callback_cpptoc.h',
-      'libcef_dll/ctocpp/media_router_ctocpp.cc',
-      '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',
-      'libcef_dll/ctocpp/views/menu_button_ctocpp.h',
-      'libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h',
-      'libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc',
-      'libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h',
-      'libcef_dll/ctocpp/menu_model_ctocpp.cc',
-      'libcef_dll/ctocpp/menu_model_ctocpp.h',
-      'libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/menu_model_delegate_cpptoc.h',
-      'libcef_dll/ctocpp/navigation_entry_ctocpp.cc',
-      'libcef_dll/ctocpp/navigation_entry_ctocpp.h',
-      'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc',
-      'libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h',
-      'libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc',
-      'libcef_dll/ctocpp/views/overlay_controller_ctocpp.h',
-      'libcef_dll/ctocpp/views/panel_ctocpp.cc',
-      'libcef_dll/ctocpp/views/panel_ctocpp.h',
-      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/panel_delegate_cpptoc.h',
-      'libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/pdf_print_callback_cpptoc.h',
+      'libcef_dll/cpptoc/menu_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/menu_handler_cpptoc.h',
+      'libcef_dll/cpptoc/permission_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/permission_handler_cpptoc.h',
       'libcef_dll/ctocpp/post_data_ctocpp.cc',
       'libcef_dll/ctocpp/post_data_ctocpp.h',
       'libcef_dll/ctocpp/post_data_element_ctocpp.cc',
       'libcef_dll/ctocpp/post_data_element_ctocpp.h',
-      'libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/print_dialog_callback_ctocpp.h',
       'libcef_dll/cpptoc/print_handler_cpptoc.cc',
       'libcef_dll/cpptoc/print_handler_cpptoc.h',
-      'libcef_dll/ctocpp/print_job_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/print_job_callback_ctocpp.h',
-      'libcef_dll/ctocpp/print_settings_ctocpp.cc',
-      'libcef_dll/ctocpp/print_settings_ctocpp.h',
-      'libcef_dll/ctocpp/process_message_ctocpp.cc',
-      'libcef_dll/ctocpp/process_message_ctocpp.h',
+      'libcef_dll/cpptoc/proxy_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/proxy_handler_cpptoc.h',
       'libcef_dll/cpptoc/read_handler_cpptoc.cc',
       'libcef_dll/cpptoc/read_handler_cpptoc.h',
-      'libcef_dll/ctocpp/registration_ctocpp.cc',
-      'libcef_dll/ctocpp/registration_ctocpp.h',
       'libcef_dll/cpptoc/render_handler_cpptoc.cc',
       'libcef_dll/cpptoc/render_handler_cpptoc.h',
-      'libcef_dll/cpptoc/render_process_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/render_process_handler_cpptoc.h',
       'libcef_dll/ctocpp/request_ctocpp.cc',
       'libcef_dll/ctocpp/request_ctocpp.h',
-      'libcef_dll/ctocpp/request_context_ctocpp.cc',
-      'libcef_dll/ctocpp/request_context_ctocpp.h',
-      'libcef_dll/cpptoc/request_context_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/request_context_handler_cpptoc.h',
       'libcef_dll/cpptoc/request_handler_cpptoc.cc',
       'libcef_dll/cpptoc/request_handler_cpptoc.h',
-      'libcef_dll/cpptoc/resolve_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/resolve_callback_cpptoc.h',
-      'libcef_dll/ctocpp/resource_bundle_ctocpp.cc',
-      'libcef_dll/ctocpp/resource_bundle_ctocpp.h',
       'libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc',
       'libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h',
-      'libcef_dll/cpptoc/resource_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/resource_handler_cpptoc.h',
-      'libcef_dll/ctocpp/resource_read_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/resource_read_callback_ctocpp.h',
-      'libcef_dll/cpptoc/resource_request_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/resource_request_handler_cpptoc.h',
-      'libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/resource_skip_callback_ctocpp.h',
       'libcef_dll/ctocpp/response_ctocpp.cc',
       'libcef_dll/ctocpp/response_ctocpp.h',
-      'libcef_dll/cpptoc/response_filter_cpptoc.cc',
-      'libcef_dll/cpptoc/response_filter_cpptoc.h',
-      'libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h',
-      'libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h',
-      'libcef_dll/ctocpp/sslinfo_ctocpp.cc',
-      'libcef_dll/ctocpp/sslinfo_ctocpp.h',
-      'libcef_dll/ctocpp/sslstatus_ctocpp.cc',
-      'libcef_dll/ctocpp/sslstatus_ctocpp.h',
+      'libcef_dll/cpptoc/scheme_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/scheme_handler_cpptoc.h',
+      'libcef_dll/ctocpp/scheme_handler_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h',
       'libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc',
       'libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h',
-      'libcef_dll/ctocpp/scheme_registrar_ctocpp.cc',
-      'libcef_dll/ctocpp/scheme_registrar_ctocpp.h',
-      'libcef_dll/ctocpp/views/scroll_view_ctocpp.cc',
-      'libcef_dll/ctocpp/views/scroll_view_ctocpp.h',
-      'libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc',
-      'libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h',
-      'libcef_dll/ctocpp/server_ctocpp.cc',
-      'libcef_dll/ctocpp/server_ctocpp.h',
-      'libcef_dll/cpptoc/server_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/server_handler_cpptoc.h',
-      'libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/set_cookie_callback_cpptoc.h',
+      'libcef_dll/cpptoc/storage_visitor_cpptoc.cc',
+      'libcef_dll/cpptoc/storage_visitor_cpptoc.h',
       'libcef_dll/ctocpp/stream_reader_ctocpp.cc',
       'libcef_dll/ctocpp/stream_reader_ctocpp.h',
       'libcef_dll/ctocpp/stream_writer_ctocpp.cc',
       'libcef_dll/ctocpp/stream_writer_ctocpp.h',
-      'libcef_dll/cpptoc/string_visitor_cpptoc.cc',
-      'libcef_dll/cpptoc/string_visitor_cpptoc.h',
       'libcef_dll/cpptoc/task_cpptoc.cc',
       'libcef_dll/cpptoc/task_cpptoc.h',
-      'libcef_dll/ctocpp/task_runner_ctocpp.cc',
-      'libcef_dll/ctocpp/task_runner_ctocpp.h',
-      'libcef_dll/ctocpp/views/textfield_ctocpp.cc',
-      'libcef_dll/ctocpp/views/textfield_ctocpp.h',
-      'libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h',
-      'libcef_dll/ctocpp/thread_ctocpp.cc',
-      'libcef_dll/ctocpp/thread_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_ctocpp.h',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h',
-      'libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h',
-      'libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.cc',
-      'libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h',
-      'libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h',
-      'libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc',
-      'libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h',
-      'libcef_dll/ctocpp/urlrequest_ctocpp.cc',
-      'libcef_dll/ctocpp/urlrequest_ctocpp.h',
-      'libcef_dll/cpptoc/urlrequest_client_cpptoc.cc',
-      'libcef_dll/cpptoc/urlrequest_client_cpptoc.h',
       'libcef_dll/cpptoc/v8accessor_cpptoc.cc',
       'libcef_dll/cpptoc/v8accessor_cpptoc.h',
-      'libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.cc',
-      'libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h',
       'libcef_dll/ctocpp/v8context_ctocpp.cc',
       'libcef_dll/ctocpp/v8context_ctocpp.h',
+      'libcef_dll/cpptoc/v8context_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/v8context_handler_cpptoc.h',
       'libcef_dll/ctocpp/v8exception_ctocpp.cc',
       'libcef_dll/ctocpp/v8exception_ctocpp.h',
       'libcef_dll/cpptoc/v8handler_cpptoc.cc',
       'libcef_dll/cpptoc/v8handler_cpptoc.h',
-      'libcef_dll/cpptoc/v8interceptor_cpptoc.cc',
-      'libcef_dll/cpptoc/v8interceptor_cpptoc.h',
-      'libcef_dll/ctocpp/v8stack_frame_ctocpp.cc',
-      'libcef_dll/ctocpp/v8stack_frame_ctocpp.h',
-      'libcef_dll/ctocpp/v8stack_trace_ctocpp.cc',
-      'libcef_dll/ctocpp/v8stack_trace_ctocpp.h',
       'libcef_dll/ctocpp/v8value_ctocpp.cc',
       'libcef_dll/ctocpp/v8value_ctocpp.h',
-      'libcef_dll/ctocpp/value_ctocpp.cc',
-      'libcef_dll/ctocpp/value_ctocpp.h',
-      'libcef_dll/ctocpp/views/view_ctocpp.cc',
-      'libcef_dll/ctocpp/views/view_ctocpp.h',
-      'libcef_dll/cpptoc/views/view_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/view_delegate_cpptoc.h',
-      'libcef_dll/ctocpp/waitable_event_ctocpp.cc',
-      'libcef_dll/ctocpp/waitable_event_ctocpp.h',
-      'libcef_dll/ctocpp/views/window_ctocpp.cc',
-      'libcef_dll/ctocpp/views/window_ctocpp.h',
-      'libcef_dll/cpptoc/views/window_delegate_cpptoc.cc',
-      'libcef_dll/cpptoc/views/window_delegate_cpptoc.h',
+      'libcef_dll/ctocpp/web_plugin_info_ctocpp.cc',
+      'libcef_dll/ctocpp/web_plugin_info_ctocpp.h',
+      'libcef_dll/ctocpp/web_urlrequest_ctocpp.cc',
+      'libcef_dll/ctocpp/web_urlrequest_ctocpp.h',
+      'libcef_dll/cpptoc/web_urlrequest_client_cpptoc.cc',
+      'libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h',
       'libcef_dll/cpptoc/write_handler_cpptoc.cc',
       'libcef_dll/cpptoc/write_handler_cpptoc.h',
-      'libcef_dll/ctocpp/x509cert_principal_ctocpp.cc',
-      'libcef_dll/ctocpp/x509cert_principal_ctocpp.h',
-      'libcef_dll/ctocpp/x509certificate_ctocpp.cc',
-      'libcef_dll/ctocpp/x509certificate_ctocpp.h',
       'libcef_dll/ctocpp/xml_reader_ctocpp.cc',
       'libcef_dll/ctocpp/xml_reader_ctocpp.h',
       'libcef_dll/ctocpp/zip_reader_ctocpp.cc',
       'libcef_dll/ctocpp/zip_reader_ctocpp.h',
+      'libcef_dll/cpptoc/zoom_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/zoom_handler_cpptoc.h',
     ],
   },
 }

cef_paths2.gypi

@@ -3,603 +3,171 @@
 # can be found in the LICENSE file.
 
 {
+  'includes': [
+    # Bring in the autogenerated source file lists.
+    'cef_paths.gypi',
+   ],
   'variables': {
     'includes_common': [
-      'include/base/cef_atomic_flag.h',
-      'include/base/cef_atomic_ref_count.h',
-      'include/base/cef_auto_reset.h',
-      'include/base/cef_basictypes.h',
-      'include/base/cef_bind.h',
-      '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_compiler_specific.h',
-      'include/base/cef_cxx17_backports.h',
-      'include/base/cef_lock.h',
-      'include/base/cef_logging.h',
-      'include/base/cef_macros.h',
-      'include/base/cef_platform_thread.h',
-      'include/base/cef_ptr_util.h',
-      'include/base/cef_ref_counted.h',
-      'include/base/cef_scoped_refptr.h',
-      'include/base/cef_template_util.h',
-      'include/base/cef_thread_checker.h',
-      'include/base/cef_trace_event.h',
-      'include/base/cef_tuple.h',
-      'include/base/cef_weak_ptr.h',
-      'include/base/internal/cef_bind_internal.h',
-      'include/base/internal/cef_callback_internal.h',
-      'include/base/internal/cef_lock_impl.h',
-      'include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h',
-      'include/base/internal/cef_scoped_policy.h',
-      'include/base/internal/cef_thread_checker_impl.h',
-      'include/cef_api_hash.h',
       'include/cef_base.h',
+      'include/cef_nplugin.h',
+      'include/cef_runnable.h',
       'include/cef_version.h',
+      'include/internal/cef_build.h',
       'include/internal/cef_export.h',
+      'include/internal/cef_nplugin_types.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_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_thread_internal.h',
+      'include/internal/cef_string_wrappers.h',
       'include/internal/cef_time.h',
-      'include/internal/cef_trace_event_internal.h',
+      'include/internal/cef_tuple.h',
       'include/internal/cef_types.h',
-      'include/internal/cef_types_geometry.h',
+      'include/internal/cef_types_wrappers.h',
+      '<@(autogen_cpp_includes)',
     ],
     'includes_capi': [
       'include/capi/cef_base_capi.h',
+      'include/capi/cef_nplugin_capi.h',
+      '<@(autogen_capi_includes)',
     ],
     'includes_wrapper': [
       'include/wrapper/cef_byte_read_handler.h',
-      'include/wrapper/cef_closure_task.h',
-      'include/wrapper/cef_helpers.h',
-      'include/wrapper/cef_message_router.h',
-      'include/wrapper/cef_resource_manager.h',
-      'include/wrapper/cef_scoped_temp_dir.h',
-      'include/wrapper/cef_stream_resource_handler.h',
       'include/wrapper/cef_xml_object.h',
       'include/wrapper/cef_zip_archive.h',
     ],
-    'includes_wrapper_mac': [
-      'include/wrapper/cef_library_loader.h',
-    ],
     'includes_win': [
-      'include/cef_sandbox_win.h',
+      'include/internal/cef_types_win.h',
       'include/internal/cef_win.h',
     ],
-    'includes_win_capi': [
-      'include/internal/cef_types_win.h',
-    ],
     'includes_mac': [
-      'include/base/cef_scoped_typeref_mac.h',
-      'include/base/internal/cef_scoped_block_mac.h',
       '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': [
       'include/internal/cef_linux.h',
-    ],
-    'includes_linux_capi': [
       'include/internal/cef_types_linux.h',
     ],
     'libcef_sources_common': [
-      'libcef_dll/cpptoc/cpptoc_ref_counted.h',
-      'libcef_dll/cpptoc/cpptoc_scoped.h',
-      'libcef_dll/ctocpp/base_ref_counted_ctocpp.cc',
-      'libcef_dll/ctocpp/base_ref_counted_ctocpp.h',
-      'libcef_dll/ctocpp/base_scoped_ctocpp.cc',
-      'libcef_dll/ctocpp/base_scoped_ctocpp.h',
-      'libcef_dll/ctocpp/ctocpp_ref_counted.h',
-      'libcef_dll/ctocpp/ctocpp_scoped.h',
+      'libcef_dll/cef_logging.h',
+      'libcef_dll/cpptoc/cpptoc.h',
+      'libcef_dll/ctocpp/ctocpp.h',
       'libcef_dll/libcef_dll.cc',
       'libcef_dll/libcef_dll2.cc',
-      'libcef_dll/ptr_util.h',
       'libcef_dll/resource.h',
-      'libcef_dll/shutdown_checker.cc',
-      'libcef_dll/shutdown_checker.h',
-      'libcef_dll/template_util.h',
-      'libcef_dll/transfer_util.cc',
+      'libcef_dll/transfer_util.cpp',
       'libcef_dll/transfer_util.h',
-      'libcef_dll/wrapper_types.h',
-    ],
-    'libcef_dll_wrapper_sources_base': [
-      'libcef_dll/base/cef_atomic_flag.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',
-      'libcef_dll/base/cef_logging.cc',
-      'libcef_dll/base/cef_ref_counted.cc',
-      'libcef_dll/base/cef_thread_checker_impl.cc',
-      'libcef_dll/base/cef_weak_ptr.cc',
+      '<@(autogen_library_side)',
     ],
     'libcef_dll_wrapper_sources_common': [
-      'libcef_dll/cpptoc/base_ref_counted_cpptoc.cc',
-      'libcef_dll/cpptoc/base_ref_counted_cpptoc.h',
-      'libcef_dll/cpptoc/base_scoped_cpptoc.cc',
-      'libcef_dll/cpptoc/base_scoped_cpptoc.h',
-      'libcef_dll/cpptoc/cpptoc_ref_counted.h',
-      'libcef_dll/cpptoc/cpptoc_scoped.h',
-      'libcef_dll/ctocpp/ctocpp_ref_counted.h',
-      'libcef_dll/ctocpp/ctocpp_scoped.h',
-      'libcef_dll/shutdown_checker.cc',
-      'libcef_dll/shutdown_checker.h',
-      'libcef_dll/template_util.h',
-      'libcef_dll/transfer_util.cc',
+      'libcef_dll/cef_logging.h',
+      'libcef_dll/cpptoc/base_cpptoc.h',
+      'libcef_dll/cpptoc/cpptoc.h',
+      'libcef_dll/ctocpp/base_ctocpp.h',
+      'libcef_dll/ctocpp/ctocpp.h',
+      'libcef_dll/transfer_util.cpp',
       'libcef_dll/transfer_util.h',
-      'libcef_dll/wrapper_types.h',
-      'libcef_dll/wrapper/cef_browser_info_map.h',
       'libcef_dll/wrapper/cef_byte_read_handler.cc',
-      'libcef_dll/wrapper/cef_closure_task.cc',
-      'libcef_dll/wrapper/cef_message_router.cc',
-      'libcef_dll/wrapper/cef_resource_manager.cc',
-      'libcef_dll/wrapper/cef_scoped_temp_dir.cc',
-      'libcef_dll/wrapper/cef_stream_resource_handler.cc',
       'libcef_dll/wrapper/cef_xml_object.cc',
       'libcef_dll/wrapper/cef_zip_archive.cc',
       'libcef_dll/wrapper/libcef_dll_wrapper.cc',
       'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
-    ],
-    'libcef_dll_wrapper_sources_mac': [
-      'libcef_dll/wrapper/cef_library_loader_mac.mm',
-      'libcef_dll/wrapper/libcef_dll_dylib.cc',
-    ],
-    'shared_sources_browser': [
-      'tests/shared/browser/client_app_browser.cc',
-      'tests/shared/browser/client_app_browser.h',
-      'tests/shared/browser/extension_util.cc',
-      'tests/shared/browser/extension_util.h',
-      'tests/shared/browser/file_util.cc',
-      'tests/shared/browser/file_util.h',
-      'tests/shared/browser/geometry_util.cc',
-      'tests/shared/browser/geometry_util.h',
-      'tests/shared/browser/main_message_loop.cc',
-      'tests/shared/browser/main_message_loop.h',
-      'tests/shared/browser/main_message_loop_external_pump.cc',
-      'tests/shared/browser/main_message_loop_external_pump.h',
-      'tests/shared/browser/main_message_loop_std.cc',
-      'tests/shared/browser/main_message_loop_std.h',
-      'tests/shared/browser/resource_util.h',
-    ],
-    'shared_sources_common': [
-      'tests/shared/common/client_app.cc',
-      'tests/shared/common/client_app.h',
-      'tests/shared/common/client_app_other.cc',
-      'tests/shared/common/client_app_other.h',
-      'tests/shared/common/client_switches.cc',
-      'tests/shared/common/client_switches.h',
-    ],
-    'shared_sources_renderer': [
-      'tests/shared/renderer/client_app_renderer.cc',
-      'tests/shared/renderer/client_app_renderer.h',
-    ],
-    'shared_sources_resources': [
-      'tests/shared/resources/osr_test.html',
-      'tests/shared/resources/pdf.html',
-      'tests/shared/resources/pdf.pdf',
-      'tests/shared/resources/window_icon.1x.png',
-      'tests/shared/resources/window_icon.2x.png',
-    ],
-    'shared_sources_linux': [
-      'tests/shared/browser/main_message_loop_external_pump_linux.cc',
-      'tests/shared/browser/resource_util_posix.cc',
-    ],
-    'shared_sources_mac': [
-      'tests/shared/browser/main_message_loop_external_pump_mac.mm',
-      'tests/shared/browser/resource_util_mac.mm',
-      'tests/shared/browser/resource_util_posix.cc',
-    ],
-    'shared_sources_mac_helper': [
-      'tests/shared/process_helper_mac.cc',
-    ],
-    'shared_sources_win': [
-      'tests/shared/browser/main_message_loop_external_pump_win.cc',
-      'tests/shared/browser/resource_util_win.cc',
-      'tests/shared/browser/util_win.cc',
-      'tests/shared/browser/util_win.h',
-    ],
-    'cefclient_sources_browser': [
-      'tests/cefclient/browser/binding_test.cc',
-      'tests/cefclient/browser/binding_test.h',
-      'tests/cefclient/browser/browser_window.cc',
-      'tests/cefclient/browser/browser_window.h',
-      'tests/cefclient/browser/bytes_write_handler.cc',
-      'tests/cefclient/browser/bytes_write_handler.h',
-      'tests/cefclient/browser/client_app_delegates_browser.cc',
-      'tests/cefclient/browser/client_browser.cc',
-      'tests/cefclient/browser/client_browser.h',
-      'tests/cefclient/browser/client_handler.cc',
-      'tests/cefclient/browser/client_handler.h',
-      'tests/cefclient/browser/client_handler_osr.cc',
-      'tests/cefclient/browser/client_handler_osr.h',
-      'tests/cefclient/browser/client_handler_std.cc',
-      'tests/cefclient/browser/client_handler_std.h',
-      'tests/cefclient/browser/client_types.h',
-      'tests/cefclient/browser/dialog_test.cc',
-      'tests/cefclient/browser/dialog_test.h',
-      'tests/cefclient/browser/image_cache.cc',
-      'tests/cefclient/browser/image_cache.h',
-      'tests/cefclient/browser/main_context.cc',
-      'tests/cefclient/browser/main_context.h',
-      'tests/cefclient/browser/main_context_impl.cc',
-      'tests/cefclient/browser/main_context_impl.h',
-      'tests/cefclient/browser/media_router_test.cc',
-      'tests/cefclient/browser/media_router_test.h',
-      'tests/cefclient/browser/osr_dragdrop_events.h',
-      'tests/cefclient/browser/osr_renderer.h',
-      'tests/cefclient/browser/osr_renderer.cc',
-      'tests/cefclient/browser/osr_renderer_settings.h',
-      'tests/cefclient/browser/preferences_test.cc',
-      'tests/cefclient/browser/preferences_test.h',
-      'tests/cefclient/browser/resource.h',
-      'tests/cefclient/browser/response_filter_test.cc',
-      'tests/cefclient/browser/response_filter_test.h',
-      'tests/cefclient/browser/root_window.cc',
-      'tests/cefclient/browser/root_window.h',
-      'tests/cefclient/browser/root_window_create.cc',
-      'tests/cefclient/browser/root_window_manager.cc',
-      'tests/cefclient/browser/root_window_manager.h',
-      'tests/cefclient/browser/root_window_views.cc',
-      'tests/cefclient/browser/root_window_views.h',
-      'tests/cefclient/browser/scheme_test.cc',
-      'tests/cefclient/browser/scheme_test.h',
-      'tests/cefclient/browser/server_test.cc',
-      'tests/cefclient/browser/server_test.h',
-      'tests/cefclient/browser/temp_window.h',
-      'tests/cefclient/browser/test_runner.cc',
-      'tests/cefclient/browser/test_runner.h',
-      'tests/cefclient/browser/urlrequest_test.cc',
-      'tests/cefclient/browser/urlrequest_test.h',
-      'tests/cefclient/browser/views_menu_bar.cc',
-      'tests/cefclient/browser/views_menu_bar.h',
-      'tests/cefclient/browser/views_overlay_controls.cc',
-      'tests/cefclient/browser/views_overlay_controls.h',
-      'tests/cefclient/browser/views_style.cc',
-      'tests/cefclient/browser/views_style.h',
-      'tests/cefclient/browser/views_window.cc',
-      'tests/cefclient/browser/views_window.h',
-      'tests/cefclient/browser/window_test.cc',
-      'tests/cefclient/browser/window_test.h',
-      'tests/cefclient/browser/window_test_runner.cc',
-      'tests/cefclient/browser/window_test_runner.h',
-      'tests/cefclient/browser/window_test_runner_views.cc',
-      'tests/cefclient/browser/window_test_runner_views.h',
+      '<@(autogen_client_side)',
     ],
     'cefclient_sources_common': [
-      'tests/cefclient/common/client_app_delegates_common.cc',
-      'tests/cefclient/common/scheme_test_common.cc',
-      'tests/cefclient/common/scheme_test_common.h',
-    ],
-    'cefclient_sources_renderer': [
-      'tests/cefclient/renderer/client_app_delegates_renderer.cc',
-      'tests/cefclient/renderer/client_renderer.cc',
-      'tests/cefclient/renderer/client_renderer.h',
-      'tests/cefclient/renderer/performance_test.cc',
-      'tests/cefclient/renderer/performance_test.h',
-      'tests/cefclient/renderer/performance_test_setup.h',
-      'tests/cefclient/renderer/performance_test_tests.cc',
-    ],
-    'cefclient_sources_resources': [
-      'tests/cefclient/resources/binding.html',
-      'tests/cefclient/resources/dialogs.html',
-      'tests/cefclient/resources/draggable.html',
-      'tests/cefclient/resources/localstorage.html',
-      'tests/cefclient/resources/logo.png',
-      'tests/cefclient/resources/media_router.html',
-      'tests/cefclient/resources/menu_icon.1x.png',
-      'tests/cefclient/resources/menu_icon.2x.png',
-      'tests/cefclient/resources/other_tests.html',
-      'tests/cefclient/resources/performance.html',
-      'tests/cefclient/resources/performance2.html',
-      'tests/cefclient/resources/preferences.html',
-      'tests/cefclient/resources/response_filter.html',
-      'tests/cefclient/resources/server.html',
-      'tests/cefclient/resources/transparency.html',
-      'tests/cefclient/resources/urlrequest.html',
-      'tests/cefclient/resources/websocket.html',
-      'tests/cefclient/resources/window.html',
-      'tests/cefclient/resources/xmlhttprequest.html',
-    ],
-    'cefclient_sources_resources_extensions_set_page_color': [
-      'tests/cefclient/resources/extensions/set_page_color/icon.png',
-      'tests/cefclient/resources/extensions/set_page_color/manifest.json',
-      'tests/cefclient/resources/extensions/set_page_color/popup.html',
-      'tests/cefclient/resources/extensions/set_page_color/popup.js',
-      'tests/cefclient/resources/extensions/set_page_color/README.md',
+      'tests/cefclient/binding_test.cpp',
+      'tests/cefclient/binding_test.h',
+      'tests/cefclient/cefclient.cpp',
+      'tests/cefclient/cefclient.h',
+      'tests/cefclient/cefclient_switches.cpp',
+      'tests/cefclient/cefclient_switches.h',
+      'tests/cefclient/client_handler.cpp',
+      'tests/cefclient/client_handler.h',
+      'tests/cefclient/client_popup_handler.cpp',
+      'tests/cefclient/client_popup_handler.h',
+      'tests/cefclient/download_handler.cpp',
+      'tests/cefclient/download_handler.h',
+      'tests/cefclient/extension_test.cpp',
+      'tests/cefclient/extension_test.h',
+      'tests/cefclient/res/domaccess.html',
+      'tests/cefclient/res/extensionperf.html',
+      'tests/cefclient/res/localstorage.html',
+      'tests/cefclient/res/logo.png',
+      'tests/cefclient/res/xmlhttprequest.html',
+      'tests/cefclient/resource_util.h',
+      'tests/cefclient/scheme_test.cpp',
+      'tests/cefclient/scheme_test.h',
+      'tests/cefclient/string_util.cpp',
+      'tests/cefclient/string_util.h',
+      'tests/cefclient/util.h',
     ],
     'cefclient_sources_win': [
-      'tests/cefclient/browser/browser_window_osr_win.cc',
-      'tests/cefclient/browser/browser_window_osr_win.h',
-      'tests/cefclient/browser/browser_window_std_win.cc',
-      'tests/cefclient/browser/browser_window_std_win.h',
-      'tests/cefclient/browser/main_context_impl_win.cc',
-      'tests/cefclient/browser/main_message_loop_multithreaded_win.cc',
-      'tests/cefclient/browser/main_message_loop_multithreaded_win.h',
-      'tests/cefclient/browser/osr_accessibility_helper.cc',
-      'tests/cefclient/browser/osr_accessibility_helper.h',
-      'tests/cefclient/browser/osr_accessibility_node.cc',
-      'tests/cefclient/browser/osr_accessibility_node.h',
-      'tests/cefclient/browser/osr_accessibility_node_win.cc',
-      'tests/cefclient/browser/osr_dragdrop_win.cc',
-      'tests/cefclient/browser/osr_dragdrop_win.h',
-      'tests/cefclient/browser/osr_ime_handler_win.cc',
-      'tests/cefclient/browser/osr_ime_handler_win.h',
-      'tests/cefclient/browser/osr_d3d11_win.cc',
-      'tests/cefclient/browser/osr_d3d11_win.h',
-      'tests/cefclient/browser/osr_render_handler_win.cc',
-      'tests/cefclient/browser/osr_render_handler_win.h',
-      'tests/cefclient/browser/osr_render_handler_win_d3d11.cc',
-      'tests/cefclient/browser/osr_render_handler_win_d3d11.h',
-      'tests/cefclient/browser/osr_render_handler_win_gl.cc',
-      'tests/cefclient/browser/osr_render_handler_win_gl.h',
-      'tests/cefclient/browser/osr_window_win.cc',
-      'tests/cefclient/browser/osr_window_win.h',
-      'tests/cefclient/browser/resource_util_win_idmap.cc',
-      'tests/cefclient/browser/root_window_win.cc',
-      'tests/cefclient/browser/root_window_win.h',
-      'tests/cefclient/browser/temp_window_win.cc',
-      'tests/cefclient/browser/temp_window_win.h',
-      'tests/cefclient/browser/window_test_runner_win.cc',
-      'tests/cefclient/browser/window_test_runner_win.h',
-      'tests/cefclient/cefclient_win.cc',
-      'tests/cefclient/resources/win/cefclient.rc',
-    ],
-    'cefclient_sources_resources_win': [
-      'tests/cefclient/resources/win/cefclient.exe.manifest',
-      'tests/cefclient/resources/win/cefclient.ico',
-      'tests/cefclient/resources/win/small.ico',
+      'tests/cefclient/cefclient.rc',
+      'tests/cefclient/cefclient_win.cpp',
+      'tests/cefclient/client_handler_win.cpp',
+      'tests/cefclient/clientplugin.cpp',
+      'tests/cefclient/clientplugin.h',
+      'tests/cefclient/osrenderer.cpp',
+      'tests/cefclient/osrenderer.h',
+      'tests/cefclient/osrplugin.cpp',
+      'tests/cefclient/osrplugin.h',
+      'tests/cefclient/osrplugin_test.cpp',
+      'tests/cefclient/osrplugin_test.h',
+      'tests/cefclient/plugin_test.cpp',
+      'tests/cefclient/plugin_test.h',
+      'tests/cefclient/Resource.h',
+      'tests/cefclient/res/cefclient.ico',
+      'tests/cefclient/res/logoball.png',
+      'tests/cefclient/res/modaldialog.html',
+      'tests/cefclient/res/modalmain.html',
+      'tests/cefclient/res/osrplugin.html',
+      'tests/cefclient/res/small.ico',
+      'tests/cefclient/res/transparency.html',
+      'tests/cefclient/res/uiplugin.html',
+      'tests/cefclient/resource_util_win.cpp',
+      'tests/cefclient/uiplugin.cpp',
+      'tests/cefclient/uiplugin.h',
+      'tests/cefclient/uiplugin_test.cpp',
+      'tests/cefclient/uiplugin_test.h',
     ],
     'cefclient_sources_mac': [
-      'tests/cefclient/browser/browser_window_osr_mac.h',
-      'tests/cefclient/browser/browser_window_osr_mac.mm',
-      'tests/cefclient/browser/browser_window_std_mac.h',
-      'tests/cefclient/browser/browser_window_std_mac.mm',
-      'tests/cefclient/browser/main_context_impl_posix.cc',
-      'tests/cefclient/browser/osr_accessibility_helper.cc',
-      'tests/cefclient/browser/osr_accessibility_helper.h',
-      'tests/cefclient/browser/osr_accessibility_node.cc',
-      'tests/cefclient/browser/osr_accessibility_node.h',
-      'tests/cefclient/browser/osr_accessibility_node_mac.mm',
-      'tests/cefclient/browser/root_window_mac.h',
-      'tests/cefclient/browser/root_window_mac.mm',
-      'tests/cefclient/browser/temp_window_mac.h',
-      'tests/cefclient/browser/temp_window_mac.mm',
-      'tests/cefclient/browser/text_input_client_osr_mac.h',
-      'tests/cefclient/browser/text_input_client_osr_mac.mm',
-      'tests/cefclient/browser/window_test_runner_mac.h',
-      'tests/cefclient/browser/window_test_runner_mac.mm',
       'tests/cefclient/cefclient_mac.mm',
-   ],
+      'tests/cefclient/client_handler_mac.mm',
+      'tests/cefclient/osrenderer.cpp',
+      'tests/cefclient/osrenderer.h',
+      'tests/cefclient/osrtest_mac.h',
+      'tests/cefclient/osrtest_mac.mm',
+      'tests/cefclient/resource_util_mac.mm',
+    ],
     'cefclient_bundle_resources_mac': [
-      'tests/cefclient/resources/mac/cefclient.icns',
-      'tests/cefclient/resources/mac/English.lproj/InfoPlist.strings',
-      'tests/cefclient/resources/mac/English.lproj/MainMenu.xib',
-      'tests/cefclient/resources/mac/Info.plist',
+      'tests/cefclient/mac/cefclient.icns',
+      'tests/cefclient/mac/English.lproj/InfoPlist.strings',
+      'tests/cefclient/mac/English.lproj/MainMenu.xib',
+      'tests/cefclient/mac/Info.plist',
+      'tests/cefclient/res/domaccess.html',
+      'tests/cefclient/res/extensionperf.html',
+      'tests/cefclient/res/localstorage.html',
+      'tests/cefclient/res/logo.png',
+      'tests/cefclient/res/logoball.png',
+      'tests/cefclient/res/osrtest.html',
+      'tests/cefclient/res/transparency.html',
+      'tests/cefclient/res/xmlhttprequest.html',
     ],
     'cefclient_sources_linux': [
-      'tests/cefclient/browser/browser_window_osr_gtk.cc',
-      'tests/cefclient/browser/browser_window_osr_gtk.h',
-      'tests/cefclient/browser/browser_window_std_gtk.cc',
-      'tests/cefclient/browser/browser_window_std_gtk.h',
-      'tests/cefclient/browser/dialog_handler_gtk.cc',
-      'tests/cefclient/browser/dialog_handler_gtk.h',
-      'tests/cefclient/browser/main_context_impl_posix.cc',
-      'tests/cefclient/browser/main_message_loop_multithreaded_gtk.cc',
-      'tests/cefclient/browser/main_message_loop_multithreaded_gtk.h',
-      'tests/cefclient/browser/print_handler_gtk.cc',
-      'tests/cefclient/browser/print_handler_gtk.h',
-      'tests/cefclient/browser/resource_util_linux.cc',
-      'tests/cefclient/browser/root_window_gtk.cc',
-      'tests/cefclient/browser/root_window_gtk.h',
-      'tests/cefclient/browser/temp_window_x11.cc',
-      'tests/cefclient/browser/temp_window_x11.h',
-      'tests/cefclient/browser/util_gtk.cc',
-      'tests/cefclient/browser/util_gtk.h',
-      'tests/cefclient/browser/window_test_runner_gtk.cc',
-      'tests/cefclient/browser/window_test_runner_gtk.h',
-      'tests/cefclient/cefclient_gtk.cc',
+      'tests/cefclient/cefclient_gtk.cpp',
+      'tests/cefclient/client_handler_gtk.cpp',
+      'tests/cefclient/resource_util_linux.cpp',
     ],
-    'cefsimple_sources_common': [
-      'tests/cefsimple/simple_app.cc',
-      'tests/cefsimple/simple_app.h',
-      'tests/cefsimple/simple_handler.cc',
-      'tests/cefsimple/simple_handler.h',
-    ],
-    'cefsimple_sources_win': [
-      'tests/cefsimple/cefsimple.rc',
-      'tests/cefsimple/cefsimple_win.cc',
-      'tests/cefsimple/simple_handler_win.cc',
-      'tests/cefsimple/resource.h',
-    ],
-    'cefsimple_sources_resources_win': [
-      'tests/cefsimple/cefsimple.exe.manifest',
-      'tests/cefsimple/res/cefsimple.ico',
-      'tests/cefsimple/res/small.ico',
-    ],
-    'cefsimple_sources_mac': [
-      'tests/cefsimple/cefsimple_mac.mm',
-      'tests/cefsimple/simple_handler_mac.mm',
-    ],
-    'cefsimple_sources_mac_helper': [
-      'tests/cefsimple/process_helper_mac.cc',
-    ],
-    'cefsimple_bundle_resources_mac': [
-      'tests/cefsimple/mac/cefsimple.icns',
-      'tests/cefsimple/mac/English.lproj/InfoPlist.strings',
-      'tests/cefsimple/mac/English.lproj/MainMenu.xib',
-      'tests/cefsimple/mac/Info.plist',
-    ],
-    'cefsimple_sources_linux': [
-      'tests/cefsimple/cefsimple_linux.cc',
-      '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',
-      'tests/ceftests/download_unittest.cc',
-      'tests/ceftests/draggable_regions_unittest.cc',
-      'tests/ceftests/extensions/background_unittest.cc',
-      'tests/ceftests/extensions/chrome_alarms_unittest.cc',
-      'tests/ceftests/extensions/chrome_storage_unittest.cc',
-      'tests/ceftests/extensions/chrome_tabs_unittest.cc',
-      'tests/ceftests/extensions/extension_test_handler.cc',
-      'tests/ceftests/extensions/extension_test_handler.h',
-      'tests/ceftests/extensions/view_unittest.cc',
-      'tests/ceftests/file_util_unittest.cc',
-      'tests/ceftests/frame_handler_unittest.cc',
-      'tests/ceftests/frame_unittest.cc',
-      'tests/ceftests/image_unittest.cc',
-      'tests/ceftests/image_util.cc',
-      'tests/ceftests/image_util.h',
-      'tests/ceftests/jsdialog_unittest.cc',
-      'tests/ceftests/life_span_unittest.cc',
-      'tests/ceftests/message_router_unittest.cc',
-      'tests/ceftests/navigation_unittest.cc',
-      'tests/ceftests/os_rendering_unittest.cc',
-      'tests/ceftests/osr_accessibility_unittest.cc',
-      'tests/ceftests/osr_display_unittest.cc',
-      'tests/ceftests/parser_unittest.cc',
-      'tests/ceftests/pdf_viewer_unittest.cc',
-      'tests/ceftests/preference_unittest.cc',
-      'tests/ceftests/print_unittest.cc',
-      'tests/ceftests/process_message_unittest.cc',
-      'tests/ceftests/request_context_unittest.cc',
-      'tests/ceftests/request_handler_unittest.cc',
-      'tests/ceftests/request_unittest.cc',
-      'tests/ceftests/response_unittest.cc',
-      'tests/ceftests/resource.h',
-      'tests/ceftests/resource_manager_unittest.cc',
-      'tests/ceftests/resource_request_handler_unittest.cc',
-      'tests/ceftests/routing_test_handler.cc',
-      'tests/ceftests/routing_test_handler.h',
-      'tests/ceftests/run_all_unittests.cc',
-      'tests/ceftests/scheme_handler_unittest.cc',
-      'tests/ceftests/scoped_temp_dir_unittest.cc',
-      'tests/ceftests/server_unittest.cc',
-      'tests/ceftests/stream_unittest.cc',
-      'tests/ceftests/stream_resource_handler_unittest.cc',
-      'tests/ceftests/string_unittest.cc',
-      'tests/ceftests/client_app_delegates.cc',
-      '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',
-      'tests/ceftests/test_util.h',
-      'tests/ceftests/thread_helper.cc',
-      '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',
-      'tests/ceftests/values_unittest.cc',
-      'tests/ceftests/version_unittest.cc',
-      'tests/ceftests/views/button_unittest.cc',
-      'tests/ceftests/views/panel_unittest.cc',
-      'tests/ceftests/views/scroll_view_unittest.cc',
-      'tests/ceftests/views/test_window_delegate.cc',
-      'tests/ceftests/views/test_window_delegate.h',
-      'tests/ceftests/views/textfield_unittest.cc',
-      'tests/ceftests/views/window_unittest.cc',
-      'tests/ceftests/waitable_event_unittest.cc',
-      'tests/ceftests/webui_unittest.cc',
-      'tests/ceftests/xml_reader_unittest.cc',
-      'tests/ceftests/zip_reader_unittest.cc',
-    ],
-    'ceftests_sources_win': [
-      'tests/ceftests/resource_util_win_idmap.cc',
-      'tests/ceftests/resources/win/ceftests.rc',
-    ],
-    'ceftests_sources_resources_win': [
-      'tests/ceftests/resources/win/ceftests.exe.manifest',
-      'tests/ceftests/resources/win/ceftests.ico',
-      'tests/ceftests/resources/win/small.ico',
-    ],
-    'ceftests_sources_mac': [
-      'tests/ceftests/os_rendering_unittest_mac.h',
-      'tests/ceftests/os_rendering_unittest_mac.mm',
-      'tests/ceftests/run_all_unittests_mac.mm',
-    ],
-    'ceftests_sources_mac_helper': [
-      'tests/shared/browser/file_util.cc',
-      'tests/shared/browser/file_util.h',
-      '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/cors_unittest.cc',
-      'tests/ceftests/dom_unittest.cc',
-      'tests/ceftests/frame_unittest.cc',
-      'tests/ceftests/message_router_unittest.cc',
-      'tests/ceftests/navigation_unittest.cc',
-      'tests/ceftests/pdf_viewer_unittest.cc',
-      'tests/ceftests/preference_unittest.cc',
-      'tests/ceftests/process_message_unittest.cc',
-      'tests/ceftests/request_handler_unittest.cc',
-      'tests/ceftests/request_unittest.cc',
-      'tests/ceftests/response_unittest.cc',
-      'tests/ceftests/resource_request_handler_unittest.cc',
-      'tests/ceftests/routing_test_handler.cc',
-      'tests/ceftests/routing_test_handler.h',
-      'tests/ceftests/scheme_handler_unittest.cc',
-      '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',
-      'tests/ceftests/tracing_unittest.cc',
-      'tests/ceftests/v8_unittest.cc',
-    ],
-    'ceftests_bundle_resources_mac': [
-      'tests/ceftests/resources/mac/ceftests.icns',
-      'tests/ceftests/resources/mac/English.lproj/InfoPlist.strings',
-      'tests/ceftests/resources/mac/English.lproj/MainMenu.xib',
-      'tests/ceftests/resources/mac/Info.plist',
-    ],
-    'ceftests_sources_linux': [
-      'tests/ceftests/resource_util_linux.cc',
+    'cefclient_bundle_resources_linux': [
+      'tests/cefclient/res/domaccess.html',
+      'tests/cefclient/res/extensionperf.html',
+      'tests/cefclient/res/localstorage.html',
+      'tests/cefclient/res/logo.png',
+      'tests/cefclient/res/xmlhttprequest.html',
     ],
   },
 }

cmake/FindCEF.cmake.in

@@ -1,39 +0,0 @@
-# Copyright (c) 2016 The Chromium Embedded Framework Authors. All rights
-# reserved. Use of this source code is governed by a BSD-style license that
-# can be found in the LICENSE file.
-
-#
-# This file is the CEF CMake configuration entry point and should be loaded
-# using `find_package(CEF REQUIRED)`. See the top-level CMakeLists.txt file
-# included with the CEF binary distribution for usage information.
-#
-
-# Find the CEF binary distribution root directory.
-set(_CEF_ROOT "")
-if(CEF_ROOT AND IS_DIRECTORY "${CEF_ROOT}")
-  set(_CEF_ROOT "${CEF_ROOT}")
-  set(_CEF_ROOT_EXPLICIT 1)
-else()
-  set(_ENV_CEF_ROOT "")
-  if(DEFINED ENV{CEF_ROOT})
-    file(TO_CMAKE_PATH "$ENV{CEF_ROOT}" _ENV_CEF_ROOT)
-  endif()
-  if(_ENV_CEF_ROOT AND IS_DIRECTORY "${_ENV_CEF_ROOT}")
-    set(_CEF_ROOT "${_ENV_CEF_ROOT}")
-    set(_CEF_ROOT_EXPLICIT 1)
-  endif()
-  unset(_ENV_CEF_ROOT)
-endif()
-
-if(NOT DEFINED _CEF_ROOT_EXPLICIT)
-  message(FATAL_ERROR "Must specify a CEF_ROOT value via CMake or environment variable.")
-endif()
-
-if(NOT IS_DIRECTORY "${_CEF_ROOT}/cmake")
-  message(FATAL_ERROR "No CMake bootstrap found for CEF binary distribution at: ${CEF_ROOT}.")
-endif()
-
-# Execute additional cmake files from the CEF binary distribution.
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${_CEF_ROOT}/cmake")
-include("cef_variables")
-include("cef_macros")

cmake/cef_macros.cmake.in

@@ -1,366 +0,0 @@
-# Copyright (c) 2016 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.
-
-# Must be loaded via FindCEF.cmake.
-if(NOT DEFINED _CEF_ROOT_EXPLICIT)
-  message(FATAL_ERROR "Use find_package(CEF) to load this file.")
-endif()
-
-
-#
-# Shared macros.
-#
-
-# Print the current CEF configuration.
-macro(PRINT_CEF_CONFIG)
-  message(STATUS "*** CEF CONFIGURATION SETTINGS ***")
-  message(STATUS "Generator:                    ${CMAKE_GENERATOR}")
-  message(STATUS "Platform:                     ${CMAKE_SYSTEM_NAME}")
-  message(STATUS "Project architecture:         ${PROJECT_ARCH}")
-
-  if(GEN_NINJA OR GEN_MAKEFILES)
-    message(STATUS "Build type:                   ${CMAKE_BUILD_TYPE}")
-  endif()
-
-  message(STATUS "Binary distribution root:     ${_CEF_ROOT}")
-
-  if(OS_MAC)
-    message(STATUS "Base SDK:                     ${CMAKE_OSX_SYSROOT}")
-    message(STATUS "Target SDK:                   ${CEF_TARGET_SDK}")
-  endif()
-
-  if(OS_WINDOWS)
-    message(STATUS "Visual Studio ATL support:    ${USE_ATL}")
-  endif()
-
-  message(STATUS "CEF sandbox:                  ${USE_SANDBOX}")
-
-  set(_libraries ${CEF_STANDARD_LIBS})
-  if(OS_WINDOWS AND USE_SANDBOX)
-    list(APPEND _libraries ${CEF_SANDBOX_STANDARD_LIBS})
-  endif()
-  message(STATUS "Standard libraries:           ${_libraries}")
-
-  message(STATUS "Compile defines:              ${CEF_COMPILER_DEFINES}")
-  message(STATUS "Compile defines (Debug):      ${CEF_COMPILER_DEFINES_DEBUG}")
-  message(STATUS "Compile defines (Release):    ${CEF_COMPILER_DEFINES_RELEASE}")
-  message(STATUS "C compile flags:              ${CEF_COMPILER_FLAGS} ${CEF_C_COMPILER_FLAGS}")
-  message(STATUS "C compile flags (Debug):      ${CEF_COMPILER_FLAGS_DEBUG} ${CEF_C_COMPILER_FLAGS_DEBUG}")
-  message(STATUS "C compile flags (Release):    ${CEF_COMPILER_FLAGS_RELEASE} ${CEF_C_COMPILER_FLAGS_RELEASE}")
-  message(STATUS "C++ compile flags:            ${CEF_COMPILER_FLAGS} ${CEF_CXX_COMPILER_FLAGS}")
-  message(STATUS "C++ compile flags (Debug):    ${CEF_COMPILER_FLAGS_DEBUG} ${CEF_CXX_COMPILER_FLAGS_DEBUG}")
-  message(STATUS "C++ compile flags (Release):  ${CEF_COMPILER_FLAGS_RELEASE} ${CEF_CXX_COMPILER_FLAGS_RELEASE}")
-  message(STATUS "Exe link flags:               ${CEF_LINKER_FLAGS} ${CEF_EXE_LINKER_FLAGS}")
-  message(STATUS "Exe link flags (Debug):       ${CEF_LINKER_FLAGS_DEBUG} ${CEF_EXE_LINKER_FLAGS_DEBUG}")
-  message(STATUS "Exe link flags (Release):     ${CEF_LINKER_FLAGS_RELEASE} ${CEF_EXE_LINKER_FLAGS_RELEASE}")
-  message(STATUS "Shared link flags:            ${CEF_LINKER_FLAGS} ${CEF_SHARED_LINKER_FLAGS}")
-  message(STATUS "Shared link flags (Debug):    ${CEF_LINKER_FLAGS_DEBUG} ${CEF_SHARED_LINKER_FLAGS_DEBUG}")
-  message(STATUS "Shared link flags (Release):  ${CEF_LINKER_FLAGS_RELEASE} ${CEF_SHARED_LINKER_FLAGS_RELEASE}")
-
-  if(OS_LINUX OR OS_WINDOWS)
-    message(STATUS "CEF Binary files:             ${CEF_BINARY_FILES}")
-    message(STATUS "CEF Resource files:           ${CEF_RESOURCE_FILES}")
-  endif()
-endmacro()
-
-# Append platform specific sources to a list of sources.
-macro(APPEND_PLATFORM_SOURCES name_of_list)
-  if(OS_LINUX AND ${name_of_list}_LINUX)
-    list(APPEND ${name_of_list} ${${name_of_list}_LINUX})
-  endif()
-  if(OS_POSIX AND ${name_of_list}_POSIX)
-    list(APPEND ${name_of_list} ${${name_of_list}_POSIX})
-  endif()
-  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})
-  endif()
-endmacro()
-
-# Determine the target output directory based on platform and generator.
-macro(SET_CEF_TARGET_OUT_DIR)
-  if(GEN_NINJA OR GEN_MAKEFILES)
-    # By default Ninja and Make builds don't create a subdirectory named after
-    # the configuration.
-    set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
-
-    # Output binaries (executables, libraries) to the correct directory.
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
-  else()
-    set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
-  endif()
-endmacro()
-
-# Copy a list of files from one directory to another. Relative files paths are maintained.
-# The path component of the source |file_list| will be removed.
-macro(COPY_FILES target file_list source_dir target_dir)
-  foreach(FILENAME ${file_list})
-    set(source_file ${source_dir}/${FILENAME})
-    get_filename_component(target_name ${FILENAME} NAME)
-    set(target_file ${target_dir}/${target_name})
-
-    string(FIND ${source_file} "$<CONFIGURATION>" _pos)
-    if(NOT ${_pos} EQUAL -1)
-      # Must test with an actual configuration directory.
-      string(REPLACE "$<CONFIGURATION>" "Release" existing_source_file ${source_file})
-      if(NOT EXISTS ${existing_source_file})
-        string(REPLACE "$<CONFIGURATION>" "Debug" existing_source_file ${source_file})
-      endif()
-    else()
-      set(existing_source_file ${source_file})
-    endif()
-
-    if(IS_DIRECTORY ${existing_source_file})
-      add_custom_command(
-        TARGET ${target}
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${source_file}" "${target_file}"
-        VERBATIM
-        )
-    else()
-      add_custom_command(
-        TARGET ${target}
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${source_file}" "${target_file}"
-        VERBATIM
-        )
-    endif()
-  endforeach()
-endmacro()
-
-
-#
-# Linux macros.
-#
-
-if(OS_LINUX)
-
-# Use pkg-config to find Linux libraries and update compiler/linker variables.
-macro(FIND_LINUX_LIBRARIES libraries)
-  # Read pkg-config info into variables.
-  execute_process(COMMAND pkg-config --cflags ${libraries} OUTPUT_VARIABLE FLL_CFLAGS)
-  execute_process(COMMAND pkg-config --libs-only-L --libs-only-other ${libraries} OUTPUT_VARIABLE FLL_LDFLAGS)
-  execute_process(COMMAND pkg-config --libs-only-l ${libraries} OUTPUT_VARIABLE FLL_LIBS)
-
-  # Strip leading and trailing whitepspace.
-  STRING(STRIP "${FLL_CFLAGS}"  FLL_CFLAGS)
-  STRING(STRIP "${FLL_LDFLAGS}" FLL_LDFLAGS)
-  STRING(STRIP "${FLL_LIBS}"    FLL_LIBS)
-
-  # Convert to a list.
-  separate_arguments(FLL_CFLAGS)
-  separate_arguments(FLL_LDFLAGS)
-  separate_arguments(FLL_LIBS)
-
-  # Update build variables.
-  list(APPEND CEF_C_COMPILER_FLAGS    ${FLL_CFLAGS})
-  list(APPEND CEF_CXX_COMPILER_FLAGS  ${FLL_CFLAGS})
-  list(APPEND CEF_EXE_LINKER_FLAGS    ${FLL_LDFLAGS})
-  list(APPEND CEF_SHARED_LINKER_FLAGS ${FLL_LDFLAGS})
-  list(APPEND CEF_STANDARD_LIBS       ${FLL_LIBS})
-endmacro()
-
-# Set SUID permissions on the specified executable.
-macro(SET_LINUX_SUID_PERMISSIONS target executable)
-  add_custom_command(
-    TARGET ${target}
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E echo ""
-    COMMAND ${CMAKE_COMMAND} -E echo "*** Run the following command manually to set SUID permissions ***"
-    COMMAND ${CMAKE_COMMAND} -E echo "EXE=\"${executable}\" && sudo -- chown root:root $EXE && sudo -- chmod 4755 $EXE"
-    COMMAND ${CMAKE_COMMAND} -E echo ""
-    VERBATIM
-    )
-endmacro()
-
-endif(OS_LINUX)
-
-
-#
-# Mac OS X macros.
-#
-
-if(OS_MAC)
-
-# Manually process and copy over resource files.
-macro(COPY_MAC_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}")
-    foreach(PREFIX ${prefix_list})
-      string(REGEX REPLACE "^.*${PREFIX}" "" TARGET_FILENAME ${TARGET_FILENAME})
-    endforeach()
-
-    # Determine the absolute source and target paths.
-    set(TARGET_PATH "${app_path}/Contents/Resources/${TARGET_FILENAME}")
-    if(IS_ABSOLUTE ${FILENAME})
-      set(SOURCE_PATH ${FILENAME})
-    else()
-      set(SOURCE_PATH "${source_dir}/${FILENAME}")
-    endif()
-
-    if(${FILENAME} MATCHES ".xib$")
-      # Change the target file extension.
-      string(REGEX REPLACE ".xib$" ".nib" TARGET_PATH ${TARGET_PATH})
-
-      get_filename_component(TARGET_DIRECTORY ${TARGET_PATH} PATH)
-      add_custom_command(
-        TARGET ${target}
-        POST_BUILD
-        # Create the target directory.
-        COMMAND ${CMAKE_COMMAND} -E make_directory "${TARGET_DIRECTORY}"
-        # Compile the XIB file to a NIB.
-        COMMAND /usr/bin/ibtool --output-format binary1 --compile "${TARGET_PATH}" "${SOURCE_PATH}"
-        VERBATIM
-        )
-    elseif(NOT ${TARGET_FILENAME} STREQUAL "Info.plist")
-      # Copy the file as-is.
-      add_custom_command(
-        TARGET ${target}
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy "${SOURCE_PATH}" "${TARGET_PATH}"
-        VERBATIM
-        )
-    endif()
-  endforeach()
-endmacro()
-
-endif(OS_MAC)
-
-
-#
-# Windows macros.
-#
-
-if(OS_WINDOWS)
-
-# Add custom manifest files to an executable target.
-macro(ADD_WINDOWS_MANIFEST manifest_path target extension)
-  add_custom_command(
-    TARGET ${target}
-    POST_BUILD
-    COMMAND "mt.exe" -nologo
-            -manifest \"${manifest_path}/${target}.${extension}.manifest\" \"${manifest_path}/compatibility.manifest\"
-            -outputresource:"${CEF_TARGET_OUT_DIR}/${target}.${extension}"\;\#1
-    COMMENT "Adding manifest..."
-    )
-endmacro()
-
-endif(OS_WINDOWS)
-
-
-#
-# Target configuration macros.
-#
-
-# Add a logical target that can be used to link the specified libraries into an
-# executable target.
-macro(ADD_LOGICAL_TARGET target debug_lib release_lib)
-  add_library(${target} ${CEF_LIBTYPE} IMPORTED)
-  set_target_properties(${target} PROPERTIES
-    IMPORTED_LOCATION "${release_lib}"
-    IMPORTED_LOCATION_DEBUG "${debug_lib}"
-    IMPORTED_LOCATION_RELEASE "${release_lib}"
-    )
-endmacro()
-
-# Set common target properties. Use SET_LIBRARY_TARGET_PROPERTIES() or
-# SET_EXECUTABLE_TARGET_PROPERTIES() instead of calling this macro directly.
-macro(SET_COMMON_TARGET_PROPERTIES target)
-  # Compile flags.
-  target_compile_options(${target} PRIVATE ${CEF_COMPILER_FLAGS} ${CEF_CXX_COMPILER_FLAGS})
-  target_compile_options(${target} PRIVATE $<$<CONFIG:Debug>:${CEF_COMPILER_FLAGS_DEBUG} ${CEF_CXX_COMPILER_FLAGS_DEBUG}>)
-  target_compile_options(${target} PRIVATE $<$<CONFIG:Release>:${CEF_COMPILER_FLAGS_RELEASE} ${CEF_CXX_COMPILER_FLAGS_RELEASE}>)
-
-  # Compile definitions.
-  target_compile_definitions(${target} PRIVATE ${CEF_COMPILER_DEFINES})
-  target_compile_definitions(${target} PRIVATE $<$<CONFIG:Debug>:${CEF_COMPILER_DEFINES_DEBUG}>)
-  target_compile_definitions(${target} PRIVATE $<$<CONFIG:Release>:${CEF_COMPILER_DEFINES_RELEASE}>)
-
-  # Include directories.
-  target_include_directories(${target} PRIVATE ${CEF_INCLUDE_PATH})
-
-  # Linker flags.
-  if(CEF_LINKER_FLAGS)
-    string(REPLACE ";" " " _flags_str "${CEF_LINKER_FLAGS}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS ${_flags_str})
-  endif()
-  if(CEF_LINKER_FLAGS_DEBUG)
-    string(REPLACE ";" " " _flags_str "${CEF_LINKER_FLAGS_DEBUG}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS_DEBUG ${_flags_str})
-  endif()
-  if(CEF_LINKER_FLAGS_RELEASE)
-    string(REPLACE ";" " " _flags_str "${CEF_LINKER_FLAGS_RELEASE}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
-  endif()
-
-  if(OS_MAC)
-    # Set Xcode target properties.
-    set_target_properties(${target} PROPERTIES
-      XCODE_ATTRIBUTE_ALWAYS_SEARCH_USER_PATHS                    NO
-      XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD                 "gnu++11"   # -std=gnu++11
-      XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME                     NO          # -fno-objc-link-runtime
-      XCODE_ATTRIBUTE_CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS  YES         # -Wobjc-missing-property-synthesis
-      XCODE_ATTRIBUTE_COPY_PHASE_STRIP                            NO
-      XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING[variant=Release]        YES         # -Wl,-dead_strip
-      XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD                     "c99"       # -std=c99
-      XCODE_ATTRIBUTE_GCC_CW_ASM_SYNTAX                           NO          # No -fasm-blocks
-      XCODE_ATTRIBUTE_GCC_DYNAMIC_NO_PIC                          NO
-      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS                   NO          # -fno-exceptions
-      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_RTTI                         NO          # -fno-rtti
-      XCODE_ATTRIBUTE_GCC_ENABLE_PASCAL_STRINGS                   NO          # No -mpascal-strings
-      XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN              YES         # -fvisibility-inlines-hidden
-      XCODE_ATTRIBUTE_GCC_OBJC_CALL_CXX_CDTORS                    YES         # -fobjc-call-cxx-cdtors
-      XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN                  YES         # -fvisibility=hidden
-      XCODE_ATTRIBUTE_GCC_THREADSAFE_STATICS                      NO          # -fno-threadsafe-statics
-      XCODE_ATTRIBUTE_GCC_TREAT_WARNINGS_AS_ERRORS                YES         # -Werror
-      XCODE_ATTRIBUTE_GCC_VERSION                                 "com.apple.compilers.llvm.clang.1_0"
-      XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_NEWLINE              YES         # -Wnewline-eof
-      XCODE_ATTRIBUTE_USE_HEADERMAP                               NO
-      OSX_ARCHITECTURES_DEBUG                                     "${CMAKE_OSX_ARCHITECTURES}"
-      OSX_ARCHITECTURES_RELEASE                                   "${CMAKE_OSX_ARCHITECTURES}"
-      )
-  endif()
-endmacro()
-
-# Set library-specific properties.
-macro(SET_LIBRARY_TARGET_PROPERTIES target)
-  SET_COMMON_TARGET_PROPERTIES(${target})
-
-  # Shared library linker flags.
-  if(CEF_SHARED_LINKER_FLAGS)
-    string(REPLACE ";" " " _flags_str "${CEF_SHARED_LINKER_FLAGS}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS ${_flags_str})
-  endif()
-  if(CEF_SHARED_LINKER_FLAGS_DEBUG)
-    string(REPLACE ";" " " _flags_str "${CEF_SHARED_LINKER_FLAGS_DEBUG}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS_DEBUG ${_flags_str})
-  endif()
-  if(CEF_SHARED_LINKER_FLAGS_RELEASE)
-    string(REPLACE ";" " " _flags_str "${CEF_SHARED_LINKER_FLAGS_RELEASE}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
-  endif()
-endmacro()
-
-# Set executable-specific properties.
-macro(SET_EXECUTABLE_TARGET_PROPERTIES target)
-  SET_COMMON_TARGET_PROPERTIES(${target})
-
-  # Executable linker flags.
-  if(CEF_EXE_LINKER_FLAGS)
-    string(REPLACE ";" " " _flags_str "${CEF_EXE_LINKER_FLAGS}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS ${_flags_str})
-  endif()
-  if(CEF_EXE_LINKER_FLAGS_DEBUG)
-    string(REPLACE ";" " " _flags_str "${CEF_EXE_LINKER_FLAGS_DEBUG}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS_DEBUG ${_flags_str})
-  endif()
-  if(CEF_EXE_LINKER_FLAGS_RELEASE)
-    string(REPLACE ";" " " _flags_str "${CEF_EXE_LINKER_FLAGS_RELEASE}")
-    set_property(TARGET ${target} PROPERTY LINK_FLAGS_RELEASE ${_flags_str})
-  endif()
-endmacro()

cmake/cef_variables.cmake.in

@@ -1,559 +0,0 @@
-# Copyright (c) 2016 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.
-
-# Must be loaded via FindCEF.cmake.
-if(NOT DEFINED _CEF_ROOT_EXPLICIT)
-  message(FATAL_ERROR "Use find_package(CEF) to load this file.")
-endif()
-
-
-#
-# Shared configuration.
-#
-
-# Determine the platform.
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-  set(OS_MAC 1)
-  set(OS_MACOSX 1)  # For backwards compatibility.
-  set(OS_POSIX 1)
-elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-  set(OS_LINUX 1)
-  set(OS_POSIX 1)
-elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-  set(OS_WINDOWS 1)
-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)
-    set(PROJECT_ARCH "x86_64")
-  else()
-    set(PROJECT_ARCH "x86")
-  endif()
-
-  if(OS_MAC)
-    # PROJECT_ARCH should be specified on Mac OS X.
-    message(WARNING "No PROJECT_ARCH value specified, using ${PROJECT_ARCH}")
-  endif()
-endif()
-
-if(${CMAKE_GENERATOR} STREQUAL "Ninja")
-  set(GEN_NINJA 1)
-elseif(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-  set(GEN_MAKEFILES 1)
-endif()
-
-# Determine the build type.
-if(NOT CMAKE_BUILD_TYPE AND (GEN_NINJA OR GEN_MAKEFILES))
-  # CMAKE_BUILD_TYPE should be specified when using Ninja or Unix Makefiles.
-  set(CMAKE_BUILD_TYPE Release)
-  message(WARNING "No CMAKE_BUILD_TYPE value selected, using ${CMAKE_BUILD_TYPE}")
-endif()
-
-
-# Path to the include directory.
-set(CEF_INCLUDE_PATH "${_CEF_ROOT}")
-
-# Path to the libcef_dll_wrapper target.
-set(CEF_LIBCEF_DLL_WRAPPER_PATH "${_CEF_ROOT}/libcef_dll")
-
-
-# Shared compiler/linker flags.
-list(APPEND CEF_COMPILER_DEFINES
-  # Allow C++ programs to use stdint.h macros specified in the C99 standard that aren't 
-  # in the C++ standard (e.g. UINT8_MAX, INT64_MIN, etc)
-  __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS
-  )
-
-
-# Configure use of the sandbox.
-option(USE_SANDBOX "Enable or disable use of the sandbox." ON)
-
-
-#
-# Linux configuration.
-#
-
-if(OS_LINUX)
-  # Platform-specific compiler/linker flags.
-  set(CEF_LIBTYPE SHARED)
-  list(APPEND CEF_COMPILER_FLAGS
-    -fno-strict-aliasing            # Avoid assumptions regarding non-aliasing of objects of different types
-    -fPIC                           # Generate position-independent code for shared libraries
-    -fstack-protector               # Protect some vulnerable functions from stack-smashing (security feature)
-    -funwind-tables                 # Support stack unwinding for backtrace()
-    -fvisibility=hidden             # Give hidden visibility to declarations that are not explicitly marked as visible
-    --param=ssp-buffer-size=4       # Set the minimum buffer size protected by SSP (security feature, related to stack-protector)
-    -pipe                           # Use pipes rather than temporary files for communication between build stages
-    -pthread                        # Use the pthread library
-    -Wall                           # Enable all warnings
-    -Werror                         # Treat warnings as errors
-    -Wno-missing-field-initializers # Don't warn about missing field initializers
-    -Wno-unused-parameter           # Don't warn about unused parameters
-    -Wno-error=comment              # Don't warn about code in comments
-    -Wno-comment                    # Don't warn about code in comments
-    -Wno-deprecated-declarations    # Don't warn about using deprecated methods
-    )
-  list(APPEND CEF_C_COMPILER_FLAGS
-    -std=c99                        # Use the C99 language standard
-    )
-  list(APPEND CEF_CXX_COMPILER_FLAGS
-    -fno-exceptions                 # Disable exceptions
-    -fno-rtti                       # Disable real-time type information
-    -fno-threadsafe-statics         # Don't generate thread-safe statics
-    -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
-    -std=c++14                      # Use the C++14 language standard
-    -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
-    )
-  list(APPEND CEF_COMPILER_FLAGS_DEBUG
-    -O0                             # Disable optimizations
-    -g                              # Generate debug information
-    )
-  list(APPEND CEF_COMPILER_FLAGS_RELEASE
-    -O2                             # Optimize for maximum speed
-    -fdata-sections                 # Enable linker optimizations to improve locality of reference for data sections
-    -ffunction-sections             # Enable linker optimizations to improve locality of reference for function sections
-    -fno-ident                      # Ignore the #ident directive
-    -U_FORTIFY_SOURCE               # Undefine _FORTIFY_SOURCE in case it was previously defined
-    -D_FORTIFY_SOURCE=2             # Add memory and string function protection (security feature, related to stack-protector)
-    )
-  list(APPEND CEF_LINKER_FLAGS
-    -fPIC                           # Generate position-independent code for shared libraries
-    -pthread                        # Use the pthread library
-    -Wl,--disable-new-dtags         # Don't generate new-style dynamic tags in ELF
-    -Wl,--fatal-warnings            # Treat warnings as errors
-    -Wl,-rpath,.                    # Set rpath so that libraries can be placed next to the executable
-    -Wl,-z,noexecstack              # Mark the stack as non-executable (security feature)
-    -Wl,-z,now                      # Resolve symbols on program start instead of on first use (security feature)
-    -Wl,-z,relro                    # Mark relocation sections as read-only (security feature)
-    )
-  list(APPEND CEF_LINKER_FLAGS_RELEASE
-    -Wl,-O1                         # Enable linker optimizations
-    -Wl,--as-needed                 # Only link libraries that export symbols used by the binary
-    -Wl,--gc-sections               # Remove unused code resulting from -fdata-sections and -function-sections
-    )
-  list(APPEND CEF_COMPILER_DEFINES
-    _FILE_OFFSET_BITS=64            # Allow the Large File Support (LFS) interface to replace the old interface
-    )
-  list(APPEND CEF_COMPILER_DEFINES_RELEASE
-    NDEBUG                          # Not a debug build
-    )
-
-  include(CheckCCompilerFlag)
-  include(CheckCXXCompilerFlag)
-
-  CHECK_CXX_COMPILER_FLAG(-Wno-undefined-var-template COMPILER_SUPPORTS_NO_UNDEFINED_VAR_TEMPLATE)
-  if(COMPILER_SUPPORTS_NO_UNDEFINED_VAR_TEMPLATE)
-    list(APPEND CEF_CXX_COMPILER_FLAGS
-      -Wno-undefined-var-template   # Don't warn about potentially uninstantiated static members
-      )
-  endif()
-
-  CHECK_C_COMPILER_FLAG(-Wno-unused-local-typedefs COMPILER_SUPPORTS_NO_UNUSED_LOCAL_TYPEDEFS)
-  if(COMPILER_SUPPORTS_NO_UNUSED_LOCAL_TYPEDEFS)
-    list(APPEND CEF_C_COMPILER_FLAGS
-      -Wno-unused-local-typedefs  # Don't warn about unused local typedefs
-      )
-  endif()
-
-  CHECK_CXX_COMPILER_FLAG(-Wno-literal-suffix COMPILER_SUPPORTS_NO_LITERAL_SUFFIX)
-  if(COMPILER_SUPPORTS_NO_LITERAL_SUFFIX)
-    list(APPEND CEF_CXX_COMPILER_FLAGS
-      -Wno-literal-suffix         # Don't warn about invalid suffixes on literals
-      )
-  endif()
-
-  CHECK_CXX_COMPILER_FLAG(-Wno-narrowing COMPILER_SUPPORTS_NO_NARROWING)
-  if(COMPILER_SUPPORTS_NO_NARROWING)
-    list(APPEND CEF_CXX_COMPILER_FLAGS
-      -Wno-narrowing              # Don't warn about type narrowing
-      )
-  endif()
-
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    list(APPEND CEF_CXX_COMPILER_FLAGS
-      -Wno-attributes             # The cfi-icall attribute is not supported by the GNU C++ compiler
-      )
-  endif()
-
-  if(PROJECT_ARCH STREQUAL "x86_64")
-    # 64-bit architecture.
-    list(APPEND CEF_COMPILER_FLAGS
-      -m64
-      -march=x86-64
-      )
-    list(APPEND CEF_LINKER_FLAGS
-      -m64
-      )
-  elseif(PROJECT_ARCH STREQUAL "x86")
-    # 32-bit architecture.
-    list(APPEND CEF_COMPILER_FLAGS
-      -msse2
-      -mfpmath=sse
-      -mmmx
-      -m32
-      )
-    list(APPEND CEF_LINKER_FLAGS
-      -m32
-      )
-  endif()
-
-  # Standard libraries.
-  set(CEF_STANDARD_LIBS
-    X11
-    )
-
-  # CEF directory paths.
-  set(CEF_RESOURCE_DIR        "${_CEF_ROOT}/Resources")
-  set(CEF_BINARY_DIR          "${_CEF_ROOT}/${CMAKE_BUILD_TYPE}")
-  set(CEF_BINARY_DIR_DEBUG    "${_CEF_ROOT}/Debug")
-  set(CEF_BINARY_DIR_RELEASE  "${_CEF_ROOT}/Release")
-
-  # CEF library paths.
-  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/libcef.so")
-  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.so")
-
-  # List of CEF binary files.
-  set(CEF_BINARY_FILES
-    chrome-sandbox
-    libcef.so
-    libEGL.so
-    libGLESv2.so
-    libvk_swiftshader.so
-    libvulkan.so.1
-    snapshot_blob.bin
-    v8_context_snapshot.bin
-    vk_swiftshader_icd.json
-    swiftshader
-    )
-
-  # List of CEF resource files.
-  set(CEF_RESOURCE_FILES
-    chrome_100_percent.pak
-    chrome_200_percent.pak
-    resources.pak
-    icudtl.dat
-    locales
-    )
-
-  if(USE_SANDBOX)
-    list(APPEND CEF_COMPILER_DEFINES
-      CEF_USE_SANDBOX   # Used by apps to test if the sandbox is enabled
-      )
-  endif()
-endif()
-
-
-#
-# Mac OS X configuration.
-#
-
-if(OS_MAC)
-  # Platform-specific compiler/linker flags.
-  # See also Xcode target properties in cef_macros.cmake.
-  set(CEF_LIBTYPE SHARED)
-  list(APPEND CEF_COMPILER_FLAGS
-    -fno-strict-aliasing            # Avoid assumptions regarding non-aliasing of objects of different types
-    -fstack-protector               # Protect some vulnerable functions from stack-smashing (security feature)
-    -funwind-tables                 # Support stack unwinding for backtrace()
-    -fvisibility=hidden             # Give hidden visibility to declarations that are not explicitly marked as visible
-    -Wall                           # Enable all warnings
-    -Werror                         # Treat warnings as errors
-    -Wextra                         # Enable additional warnings
-    -Wendif-labels                  # Warn whenever an #else or an #endif is followed by text
-    -Wnewline-eof                   # Warn about no newline at end of file
-    -Wno-missing-field-initializers # Don't warn about missing field initializers
-    -Wno-unused-parameter           # Don't warn about unused parameters
-    )
-  list(APPEND CEF_C_COMPILER_FLAGS
-    -std=c99                        # Use the C99 language standard
-    )
-  list(APPEND CEF_CXX_COMPILER_FLAGS
-    -fno-exceptions                 # Disable exceptions
-    -fno-rtti                       # Disable real-time type information
-    -fno-threadsafe-statics         # Don't generate thread-safe statics
-    -fobjc-call-cxx-cdtors          # Call the constructor/destructor of C++ instance variables in ObjC objects
-    -fvisibility-inlines-hidden     # Give hidden visibility to inlined class member functions
-    -std=c++14                      # Use the C++14 language standard
-    -Wno-narrowing                  # Don't warn about type narrowing
-    -Wsign-compare                  # Warn about mixed signed/unsigned type comparisons
-    )
-  list(APPEND CEF_COMPILER_FLAGS_DEBUG
-    -O0                             # Disable optimizations
-    -g                              # Generate debug information
-    )
-  list(APPEND CEF_COMPILER_FLAGS_RELEASE
-    -O3                             # Optimize for maximum speed plus a few extras
-    )
-  list(APPEND CEF_LINKER_FLAGS
-    -Wl,-search_paths_first         # Search for static or shared library versions in the same pass
-    -Wl,-ObjC                       # Support creation of ObjC static libraries
-    -Wl,-pie                        # Generate position-independent code suitable for executables only
-    )
-  list(APPEND CEF_LINKER_FLAGS_RELEASE
-    -Wl,-dead_strip                 # Strip dead code
-    )
-
-  include(CheckCXXCompilerFlag)
-
-  CHECK_CXX_COMPILER_FLAG(-Wno-undefined-var-template COMPILER_SUPPORTS_NO_UNDEFINED_VAR_TEMPLATE)
-  if(COMPILER_SUPPORTS_NO_UNDEFINED_VAR_TEMPLATE)
-    list(APPEND CEF_CXX_COMPILER_FLAGS
-      -Wno-undefined-var-template   # Don't warn about potentially uninstantiated static members
-      )
-  endif()
-
-  # Standard libraries.
-  set(CEF_STANDARD_LIBS
-    -lpthread
-    "-framework Cocoa"
-    "-framework AppKit"
-    )
-
-  # 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)
-    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})
-    endif()
-  endforeach()
-
-  # Target SDK.
-  set(CEF_TARGET_SDK               "10.11")
-  list(APPEND CEF_COMPILER_FLAGS
-    -mmacosx-version-min=${CEF_TARGET_SDK}
-  )
-  set(CMAKE_OSX_DEPLOYMENT_TARGET  ${CEF_TARGET_SDK})
-
-  # 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()
-
-  # Prevent Xcode 11 from doing automatic codesigning.
-  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
-
-  # CEF directory paths.
-  set(CEF_BINARY_DIR          "${_CEF_ROOT}/$<CONFIGURATION>")
-  set(CEF_BINARY_DIR_DEBUG    "${_CEF_ROOT}/Debug")
-  set(CEF_BINARY_DIR_RELEASE  "${_CEF_ROOT}/Release")
-
-  if(USE_SANDBOX)
-    list(APPEND CEF_COMPILER_DEFINES
-      CEF_USE_SANDBOX   # Used by apps to test if the sandbox is enabled
-      )
-
-    # CEF sandbox library paths.
-    set(CEF_SANDBOX_LIB_DEBUG "${CEF_BINARY_DIR_DEBUG}/cef_sandbox.a")
-    set(CEF_SANDBOX_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/cef_sandbox.a")
-  endif()
-
-  # CEF Helper app suffixes.
-  # Format is "<name suffix>:<target suffix>:<plist suffix>".
-  set(CEF_HELPER_APP_SUFFIXES
-    "::"
-    " (GPU):_gpu:.gpu"
-    " (Plugin):_plugin:.plugin"
-    " (Renderer):_renderer:.renderer"
-    )
-endif()
-
-
-#
-# Windows configuration.
-#
-
-if(OS_WINDOWS)
-  if (GEN_NINJA)
-    # When using the Ninja generator clear the CMake defaults to avoid excessive
-    # console warnings (see issue #2120).
-    set(CMAKE_CXX_FLAGS "")
-    set(CMAKE_CXX_FLAGS_DEBUG "")
-    set(CMAKE_CXX_FLAGS_RELEASE "")
-  endif()
-
-  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)
-      message(WARNING "CEF sandbox is not compatible with the current MSVC version (${MSVC_VERSION})")
-      set(USE_SANDBOX OFF)
-    endif()
-  endif()
-
-  # Consumers who run into LNK4099 warnings can pass /Z7 instead (see issue #385).
-  set(CEF_DEBUG_INFO_FLAG "/Zi" CACHE STRING "Optional flag specifying specific /Z flag to use")
-
-  # Consumers using different runtime types may want to pass different flags
-  set(CEF_RUNTIME_LIBRARY_FLAG "/MT" CACHE STRING "Optional flag specifying which runtime to use")
-  if (CEF_RUNTIME_LIBRARY_FLAG)
-    list(APPEND CEF_COMPILER_FLAGS_DEBUG ${CEF_RUNTIME_LIBRARY_FLAG}d)
-    list(APPEND CEF_COMPILER_FLAGS_RELEASE ${CEF_RUNTIME_LIBRARY_FLAG})
-  endif()
-
-  # Platform-specific compiler/linker flags.
-  set(CEF_LIBTYPE STATIC)
-  list(APPEND CEF_COMPILER_FLAGS
-    /MP           # Multiprocess compilation
-    /Gy           # Enable function-level linking
-    /GR-          # Disable run-time type information
-    /W4           # Warning level 4
-    /WX           # Treat warnings as errors
-    /wd4100       # Ignore "unreferenced formal parameter" warning
-    /wd4127       # Ignore "conditional expression is constant" warning
-    /wd4244       # Ignore "conversion possible loss of data" warning
-    /wd4324       # Ignore "structure was padded due to alignment specifier" warning
-    /wd4481       # Ignore "nonstandard extension used: override" warning
-    /wd4512       # Ignore "assignment operator could not be generated" warning
-    /wd4701       # Ignore "potentially uninitialized local variable" warning
-    /wd4702       # Ignore "unreachable code" warning
-    /wd4996       # Ignore "function or variable may be unsafe" warning
-    ${CEF_DEBUG_INFO_FLAG}
-    )
-  list(APPEND CEF_COMPILER_FLAGS_DEBUG
-    /RTC1         # Disable optimizations
-    /Od           # Enable basic run-time checks
-    )
-  list(APPEND CEF_COMPILER_FLAGS_RELEASE
-    /O2           # Optimize for maximum speed
-    /Ob2          # Inline any suitable function
-    /GF           # Enable string pooling
-    )
-  list(APPEND CEF_LINKER_FLAGS_DEBUG
-    /DEBUG        # Generate debug information
-    )
-  list(APPEND CEF_EXE_LINKER_FLAGS
-    /MANIFEST:NO        # No default manifest (see ADD_WINDOWS_MANIFEST macro usage)
-    /LARGEADDRESSAWARE  # Allow 32-bit processes to access 3GB of RAM
-    )
-  list(APPEND CEF_COMPILER_DEFINES
-    WIN32 _WIN32 _WINDOWS             # Windows platform
-    UNICODE _UNICODE                  # Unicode build
-    WINVER=0x0601 _WIN32_WINNT=0x601  # Targeting Windows 7
-    NOMINMAX                          # Use the standard's templated min/max
-    WIN32_LEAN_AND_MEAN               # Exclude less common API declarations
-    _HAS_EXCEPTIONS=0                 # Disable exceptions
-    )
-  list(APPEND CEF_COMPILER_DEFINES_RELEASE
-    NDEBUG _NDEBUG                    # Not a debug build
-    )
-
-  # Standard libraries.
-  set(CEF_STANDARD_LIBS
-    comctl32.lib
-    gdi32.lib
-    rpcrt4.lib
-    shlwapi.lib
-    ws2_32.lib
-    )
-
-  # CEF directory paths.
-  set(CEF_RESOURCE_DIR        "${_CEF_ROOT}/Resources")
-  set(CEF_BINARY_DIR          "${_CEF_ROOT}/$<CONFIGURATION>")
-  set(CEF_BINARY_DIR_DEBUG    "${_CEF_ROOT}/Debug")
-  set(CEF_BINARY_DIR_RELEASE  "${_CEF_ROOT}/Release")
-
-  # CEF library paths.
-  set(CEF_LIB_DEBUG   "${CEF_BINARY_DIR_DEBUG}/libcef.lib")
-  set(CEF_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/libcef.lib")
-
-  # List of CEF binary files.
-  set(CEF_BINARY_FILES
-    chrome_elf.dll
-    libcef.dll
-    libEGL.dll
-    libGLESv2.dll
-    snapshot_blob.bin
-    v8_context_snapshot.bin
-    vk_swiftshader.dll
-    vk_swiftshader_icd.json
-    vulkan-1.dll
-    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
-    chrome_100_percent.pak
-    chrome_200_percent.pak
-    resources.pak
-    icudtl.dat
-    locales
-    )
-
-  if(USE_SANDBOX)
-    list(APPEND CEF_COMPILER_DEFINES
-      PSAPI_VERSION=1   # Required by cef_sandbox.lib
-      CEF_USE_SANDBOX   # Used by apps to test if the sandbox is enabled
-      )
-    list(APPEND CEF_COMPILER_DEFINES_DEBUG
-      _HAS_ITERATOR_DEBUGGING=0   # Disable iterator debugging
-      )
-
-    # 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
-      )
-
-    # CEF sandbox library paths.
-    set(CEF_SANDBOX_LIB_DEBUG "${CEF_BINARY_DIR_DEBUG}/cef_sandbox.lib")
-    set(CEF_SANDBOX_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/cef_sandbox.lib")
-  endif()
-
-  # Configure use of ATL.
-  option(USE_ATL "Enable or disable use of ATL." ON)
-  if(USE_ATL)
-    # Locate the atlmfc directory if it exists. It may be at any depth inside
-    # the VC directory. The cl.exe path returned by CMAKE_CXX_COMPILER may also
-    # be at different depths depending on the toolchain version
-    # (e.g. "VC/bin/cl.exe", "VC/bin/amd64_x86/cl.exe",
-    # "VC/Tools/MSVC/14.10.25017/bin/HostX86/x86/cl.exe", etc).
-    set(HAS_ATLMFC 0)
-    get_filename_component(VC_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
-    get_filename_component(VC_DIR_NAME ${VC_DIR} NAME)
-    while(NOT ${VC_DIR_NAME} STREQUAL "VC")
-      get_filename_component(VC_DIR ${VC_DIR} DIRECTORY)
-      if(IS_DIRECTORY "${VC_DIR}/atlmfc")
-        set(HAS_ATLMFC 1)
-        break()
-      endif()
-      get_filename_component(VC_DIR_NAME ${VC_DIR} NAME)
-    endwhile()
-
-    # Determine if the Visual Studio install supports ATL.
-    if(NOT HAS_ATLMFC)
-      message(WARNING "ATL is not supported by your VC installation.")
-      set(USE_ATL OFF)
-    endif()
-  endif()
-
-  if(USE_ATL)
-    list(APPEND CEF_COMPILER_DEFINES
-      CEF_USE_ATL   # Used by apps to test if ATL support is enabled
-      )
-  endif()
-endif()

include/base/cef_atomic_flag.h

@@ -1,88 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
-#define CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/synchronization/atomic_flag.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 <stdint.h>
-
-#include <atomic>
-
-#include "include/base/cef_thread_checker.h"
-
-namespace base {
-
-// A flag that can safely be set from one thread and read from other threads.
-//
-// This class IS NOT intended for synchronization between threads.
-class AtomicFlag {
- public:
-  AtomicFlag();
-
-  AtomicFlag(const AtomicFlag&) = delete;
-  AtomicFlag& operator=(const AtomicFlag&) = delete;
-
-  ~AtomicFlag();
-
-  // Set the flag. Must always be called from the same thread.
-  void Set();
-
-  // Returns true iff the flag was set. If this returns true, the current thread
-  // is guaranteed to be synchronized with all memory operations on the thread
-  // which invoked Set() up until at least the first call to Set() on it.
-  bool IsSet() const {
-    // Inline here: this has a measurable performance impact on base::WeakPtr.
-    return flag_.load(std::memory_order_acquire) != 0;
-  }
-
-  // Resets the flag. Be careful when using this: callers might not expect
-  // IsSet() to return false after returning true once.
-  void UnsafeResetForTesting();
-
- private:
-  std::atomic<uint_fast8_t> flag_{0};
-  base::ThreadChecker set_thread_checker_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_

include/base/cef_atomic_ref_count.h

@@ -1,111 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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 is a low level implementation of atomic semantics for reference
-// counting.  Please use cef_ref_counted.h directly instead.
-//
-// The Chromium implementation includes annotations to avoid some false
-// positives when using data race detection tools. Annotations are not
-// currently supported by the CEF implementation.
-
-#ifndef CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_
-#define CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/atomic_ref_count.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 <atomic>
-
-namespace base {
-
-class AtomicRefCount {
- public:
-  constexpr AtomicRefCount() : ref_count_(0) {}
-  explicit constexpr AtomicRefCount(int initial_value)
-      : ref_count_(initial_value) {}
-
-  // Increment a reference count.
-  // Returns the previous value of the count.
-  int Increment() { return Increment(1); }
-
-  // Increment a reference count by "increment", which must exceed 0.
-  // Returns the previous value of the count.
-  int Increment(int increment) {
-    return ref_count_.fetch_add(increment, std::memory_order_relaxed);
-  }
-
-  // Decrement a reference count, and return whether the result is non-zero.
-  // Insert barriers to ensure that state written before the reference count
-  // became zero will be visible to a thread that has just made the count zero.
-  bool Decrement() {
-    // TODO(jbroman): Technically this doesn't need to be an acquire operation
-    // unless the result is 1 (i.e., the ref count did indeed reach zero).
-    // However, there are toolchain issues that make that not work as well at
-    // present (notably TSAN doesn't like it).
-    return ref_count_.fetch_sub(1, std::memory_order_acq_rel) != 1;
-  }
-
-  // Return whether the reference count is one.  If the reference count is used
-  // in the conventional way, a refrerence count of 1 implies that the current
-  // thread owns the reference and no other thread shares it.  This call
-  // performs the test for a reference count of one, and performs the memory
-  // barrier needed for the owning thread to act on the object, knowing that it
-  // has exclusive access to the object.
-  bool IsOne() const { return ref_count_.load(std::memory_order_acquire) == 1; }
-
-  // Return whether the reference count is zero.  With conventional object
-  // referencing counting, the object will be destroyed, so the reference count
-  // should never be zero.  Hence this is generally used for a debug check.
-  bool IsZero() const {
-    return ref_count_.load(std::memory_order_acquire) == 0;
-  }
-
-  // Returns the current reference count (with no barriers). This is subtle, and
-  // should be used only for debugging.
-  int SubtleRefCountForDebug() const {
-    return ref_count_.load(std::memory_order_relaxed);
-  }
-
- private:
-  std::atomic_int ref_count_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_

include/base/cef_auto_reset.h

@@ -1,89 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-// base::AutoReset<> is useful for setting a variable to a new value only within
-// a particular scope. An base::AutoReset<> object resets a variable to its
-// original value upon destruction, making it an alternative to writing
-// "var = false;" or "var = old_val;" at all of a block's exit points.
-//
-// This should be obvious, but note that an base::AutoReset<> instance should
-// have a shorter lifetime than its scoped_variable, to prevent invalid memory
-// writes when the base::AutoReset<> object is destroyed.
-
-#ifndef CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
-#define CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/auto_reset.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 <utility>
-
-namespace base {
-
-template <typename T>
-class AutoReset {
- public:
-  template <typename U>
-  AutoReset(T* scoped_variable, U&& new_value)
-      : scoped_variable_(scoped_variable),
-        original_value_(
-            std::exchange(*scoped_variable_, std::forward<U>(new_value))) {}
-
-  AutoReset(AutoReset&& other)
-      : scoped_variable_(std::exchange(other.scoped_variable_, nullptr)),
-        original_value_(std::move(other.original_value_)) {}
-
-  AutoReset& operator=(AutoReset&& rhs) {
-    scoped_variable_ = std::exchange(rhs.scoped_variable_, nullptr);
-    original_value_ = std::move(rhs.original_value_);
-    return *this;
-  }
-
-  ~AutoReset() {
-    if (scoped_variable_)
-      *scoped_variable_ = std::move(original_value_);
-  }
-
- private:
-  T* scoped_variable_;
-  T original_value_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_

include/base/cef_basictypes.h

@@ -1,86 +0,0 @@
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
-#define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
-#pragma once
-
-#include <limits.h>  // For UINT_MAX
-#include <stddef.h>  // For size_t
-
-#include "include/base/cef_build.h"
-
-// The NSPR system headers define 64-bit as |long| when possible, except on
-// Mac OS X.  In order to not have typedef mismatches, we do the same on LP64.
-//
-// 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)
-typedef long int64;
-typedef unsigned long uint64;
-#else
-typedef long long int64;
-typedef unsigned long long uint64;
-#endif
-
-// TODO: Remove these type guards.  These are to avoid conflicts with
-// obsolete/protypes.h in the Gecko SDK.
-#ifndef _INT32
-#define _INT32
-typedef int int32;
-#endif
-
-// TODO: Remove these type guards.  These are to avoid conflicts with
-// obsolete/protypes.h in the Gecko SDK.
-#ifndef _UINT32
-#define _UINT32
-typedef unsigned int uint32;
-#endif
-
-#ifndef _INT16
-#define _INT16
-typedef short int16;
-#endif
-
-#ifndef _UINT16
-#define _UINT16
-typedef unsigned short uint16;
-#endif
-
-// UTF-16 character type.
-#ifndef char16
-#if defined(WCHAR_T_IS_UTF16)
-typedef wchar_t char16;
-#elif defined(WCHAR_T_IS_UTF32)
-typedef unsigned short char16;
-#endif
-#endif
-
-#endif  // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_

include/base/cef_bind.h

@@ -1,352 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-// -----------------------------------------------------------------------------
-// Usage documentation
-// -----------------------------------------------------------------------------
-//
-// Overview:
-// base::BindOnce() and base::BindRepeating() are helpers for creating
-// base::OnceCallback and base::RepeatingCallback objects respectively.
-//
-// For a runnable object of n-arity, the base::Bind*() family allows partial
-// application of the first m arguments. The remaining n - m arguments must be
-// passed when invoking the callback with Run().
-//
-//   // The first argument is bound at callback creation; the remaining
-//   // two must be passed when calling Run() on the callback object.
-//   base::OnceCallback<long(int, long)> cb = base::BindOnce(
-//       [](short x, int y, long z) { return x * y * z; }, 42);
-//
-// When binding to a method, the receiver object must also be specified at
-// callback creation time. When Run() is invoked, the method will be invoked on
-// the specified receiver object.
-//
-//   class C : public base::RefCounted<C> { void F(); };
-//   auto instance = base::MakeRefCounted<C>();
-//   auto cb = base::BindOnce(&C::F, instance);
-//   std::move(cb).Run();  // Identical to instance->F()
-//
-// See //docs/callback.md for the full documentation.
-//
-// -----------------------------------------------------------------------------
-// Implementation notes
-// -----------------------------------------------------------------------------
-//
-// If you're reading the implementation, before proceeding further, you should
-// read the top comment of base/internal/cef_bind_internal.h for a definition of
-// common terms and concepts.
-
-#ifndef CEF_INCLUDE_BASE_CEF_BIND_H_
-#define CEF_INCLUDE_BASE_CEF_BIND_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/bind.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 <functional>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "include/base/cef_build.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_template_util.h"
-#include "include/base/internal/cef_bind_internal.h"
-
-#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
-#include "include/base/internal/cef_scoped_block_mac.h"
-#endif
-
-namespace base {
-
-// Bind as OnceCallback.
-template <typename Functor, typename... Args>
-inline OnceCallback<internal::MakeUnboundRunType<Functor, Args...>> BindOnce(
-    Functor&& functor,
-    Args&&... args) {
-  static_assert(!internal::IsOnceCallback<std::decay_t<Functor>>() ||
-                    (std::is_rvalue_reference<Functor&&>() &&
-                     !std::is_const<std::remove_reference_t<Functor>>()),
-                "BindOnce requires non-const rvalue for OnceCallback binding."
-                " I.e.: base::BindOnce(std::move(callback)).");
-  static_assert(
-      conjunction<
-          internal::AssertBindArgIsNotBasePassed<std::decay_t<Args>>...>::value,
-      "Use std::move() instead of base::Passed() with base::BindOnce()");
-
-  return internal::BindImpl<OnceCallback>(std::forward<Functor>(functor),
-                                          std::forward<Args>(args)...);
-}
-
-// Bind as RepeatingCallback.
-template <typename Functor, typename... Args>
-inline RepeatingCallback<internal::MakeUnboundRunType<Functor, Args...>>
-BindRepeating(Functor&& functor, Args&&... args) {
-  static_assert(
-      !internal::IsOnceCallback<std::decay_t<Functor>>(),
-      "BindRepeating cannot bind OnceCallback. Use BindOnce with std::move().");
-
-  return internal::BindImpl<RepeatingCallback>(std::forward<Functor>(functor),
-                                               std::forward<Args>(args)...);
-}
-
-// Special cases for binding to a base::Callback without extra bound arguments.
-// We CHECK() the validity of callback to guard against null pointers
-// accidentally ending up in posted tasks, causing hard-to-debug crashes.
-template <typename Signature>
-OnceCallback<Signature> BindOnce(OnceCallback<Signature> callback) {
-  CHECK(callback);
-  return callback;
-}
-
-template <typename Signature>
-OnceCallback<Signature> BindOnce(RepeatingCallback<Signature> callback) {
-  CHECK(callback);
-  return callback;
-}
-
-template <typename Signature>
-RepeatingCallback<Signature> BindRepeating(
-    RepeatingCallback<Signature> callback) {
-  CHECK(callback);
-  return callback;
-}
-
-// Unretained() allows binding a non-refcounted class, and to disable
-// refcounting on arguments that are refcounted objects.
-//
-// EXAMPLE OF Unretained():
-//
-//   class Foo {
-//    public:
-//     void func() { cout << "Foo:f" << endl; }
-//   };
-//
-//   // In some function somewhere.
-//   Foo foo;
-//   OnceClosure foo_callback =
-//       BindOnce(&Foo::func, Unretained(&foo));
-//   std::move(foo_callback).Run();  // Prints "Foo:f".
-//
-// Without the Unretained() wrapper on |&foo|, the above call would fail
-// to compile because Foo does not support the AddRef() and Release() methods.
-template <typename T>
-inline internal::UnretainedWrapper<T> Unretained(T* o) {
-  return internal::UnretainedWrapper<T>(o);
-}
-
-// RetainedRef() accepts a ref counted object and retains a reference to it.
-// When the callback is called, the object is passed as a raw pointer.
-//
-// EXAMPLE OF RetainedRef():
-//
-//    void foo(RefCountedBytes* bytes) {}
-//
-//    scoped_refptr<RefCountedBytes> bytes = ...;
-//    OnceClosure callback = BindOnce(&foo, base::RetainedRef(bytes));
-//    std::move(callback).Run();
-//
-// Without RetainedRef, the scoped_refptr would try to implicitly convert to
-// a raw pointer and fail compilation:
-//
-//    OnceClosure callback = BindOnce(&foo, bytes); // ERROR!
-template <typename T>
-inline internal::RetainedRefWrapper<T> RetainedRef(T* o) {
-  return internal::RetainedRefWrapper<T>(o);
-}
-template <typename T>
-inline internal::RetainedRefWrapper<T> RetainedRef(scoped_refptr<T> o) {
-  return internal::RetainedRefWrapper<T>(std::move(o));
-}
-
-// Owned() transfers ownership of an object to the callback resulting from
-// bind; the object will be deleted when the callback is deleted.
-//
-// EXAMPLE OF Owned():
-//
-//   void foo(int* arg) { cout << *arg << endl }
-//
-//   int* pn = new int(1);
-//   RepeatingClosure foo_callback = BindRepeating(&foo, Owned(pn));
-//
-//   foo_callback.Run();  // Prints "1"
-//   foo_callback.Run();  // Prints "1"
-//   *pn = 2;
-//   foo_callback.Run();  // Prints "2"
-//
-//   foo_callback.Reset();  // |pn| is deleted.  Also will happen when
-//                          // |foo_callback| goes out of scope.
-//
-// Without Owned(), someone would have to know to delete |pn| when the last
-// reference to the callback is deleted.
-template <typename T>
-inline internal::OwnedWrapper<T> Owned(T* o) {
-  return internal::OwnedWrapper<T>(o);
-}
-
-template <typename T, typename Deleter>
-inline internal::OwnedWrapper<T, Deleter> Owned(
-    std::unique_ptr<T, Deleter>&& ptr) {
-  return internal::OwnedWrapper<T, Deleter>(std::move(ptr));
-}
-
-// OwnedRef() stores an object in the callback resulting from
-// bind and passes a reference to the object to the bound function.
-//
-// EXAMPLE OF OwnedRef():
-//
-//   void foo(int& arg) { cout << ++arg << endl }
-//
-//   int counter = 0;
-//   RepeatingClosure foo_callback = BindRepeating(&foo, OwnedRef(counter));
-//
-//   foo_callback.Run();  // Prints "1"
-//   foo_callback.Run();  // Prints "2"
-//   foo_callback.Run();  // Prints "3"
-//
-//   cout << counter;     // Prints "0", OwnedRef creates a copy of counter.
-//
-//  Supports OnceCallbacks as well, useful to pass placeholder arguments:
-//
-//   void bar(int& ignore, const std::string& s) { cout << s << endl }
-//
-//   OnceClosure bar_callback = BindOnce(&bar, OwnedRef(0), "Hello");
-//
-//   std::move(bar_callback).Run(); // Prints "Hello"
-//
-// Without OwnedRef() it would not be possible to pass a mutable reference to an
-// object owned by the callback.
-template <typename T>
-internal::OwnedRefWrapper<std::decay_t<T>> OwnedRef(T&& t) {
-  return internal::OwnedRefWrapper<std::decay_t<T>>(std::forward<T>(t));
-}
-
-// Passed() is for transferring movable-but-not-copyable types (eg. unique_ptr)
-// through a RepeatingCallback. Logically, this signifies a destructive transfer
-// of the state of the argument into the target function. Invoking
-// RepeatingCallback::Run() twice on a callback that was created with a Passed()
-// argument will CHECK() because the first invocation would have already
-// transferred ownership to the target function.
-//
-// Note that Passed() is not necessary with BindOnce(), as std::move() does the
-// same thing. Avoid Passed() in favor of std::move() with BindOnce().
-//
-// EXAMPLE OF Passed():
-//
-//   void TakesOwnership(std::unique_ptr<Foo> arg) { }
-//   std::unique_ptr<Foo> CreateFoo() { return std::make_unique<Foo>();
-//   }
-//
-//   auto f = std::make_unique<Foo>();
-//
-//   // |cb| is given ownership of Foo(). |f| is now NULL.
-//   // You can use std::move(f) in place of &f, but it's more verbose.
-//   RepeatingClosure cb = BindRepeating(&TakesOwnership, Passed(&f));
-//
-//   // Run was never called so |cb| still owns Foo() and deletes
-//   // it on Reset().
-//   cb.Reset();
-//
-//   // |cb| is given a new Foo created by CreateFoo().
-//   cb = BindRepeating(&TakesOwnership, Passed(CreateFoo()));
-//
-//   // |arg| in TakesOwnership() is given ownership of Foo(). |cb|
-//   // no longer owns Foo() and, if reset, would not delete Foo().
-//   cb.Run();  // Foo() is now transferred to |arg| and deleted.
-//   cb.Run();  // This CHECK()s since Foo() already been used once.
-//
-// We offer 2 syntaxes for calling Passed(). The first takes an rvalue and is
-// best suited for use with the return value of a function or other temporary
-// rvalues. The second takes a pointer to the scoper and is just syntactic sugar
-// to avoid having to write Passed(std::move(scoper)).
-//
-// Both versions of Passed() prevent T from being an lvalue reference. The first
-// via use of enable_if, and the second takes a T* which will not bind to T&.
-template <typename T,
-          std::enable_if_t<!std::is_lvalue_reference<T>::value>* = nullptr>
-inline internal::PassedWrapper<T> Passed(T&& scoper) {
-  return internal::PassedWrapper<T>(std::move(scoper));
-}
-template <typename T>
-inline internal::PassedWrapper<T> Passed(T* scoper) {
-  return internal::PassedWrapper<T>(std::move(*scoper));
-}
-
-// IgnoreResult() is used to adapt a function or callback with a return type to
-// one with a void return. This is most useful if you have a function with,
-// say, a pesky ignorable bool return that you want to use with PostTask or
-// something else that expect a callback with a void return.
-//
-// EXAMPLE OF IgnoreResult():
-//
-//   int DoSomething(int arg) { cout << arg << endl; }
-//
-//   // Assign to a callback with a void return type.
-//   OnceCallback<void(int)> cb = BindOnce(IgnoreResult(&DoSomething));
-//   std::move(cb).Run(1);  // Prints "1".
-//
-//   // Prints "2" on |ml|.
-//   ml->PostTask(FROM_HERE, BindOnce(IgnoreResult(&DoSomething), 2);
-template <typename T>
-inline internal::IgnoreResultHelper<T> IgnoreResult(T data) {
-  return internal::IgnoreResultHelper<T>(std::move(data));
-}
-
-#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
-
-// RetainBlock() is used to adapt an Objective-C block when Automated Reference
-// Counting (ARC) is disabled. This is unnecessary when ARC is enabled, as the
-// BindOnce and BindRepeating already support blocks then.
-//
-// EXAMPLE OF RetainBlock():
-//
-//   // Wrap the block and bind it to a callback.
-//   OnceCallback<void(int)> cb =
-//       BindOnce(RetainBlock(^(int n) { NSLog(@"%d", n); }));
-//   std::move(cb).Run(1);  // Logs "1".
-template <typename R, typename... Args>
-base::mac::ScopedBlock<R (^)(Args...)> RetainBlock(R (^block)(Args...)) {
-  return base::mac::ScopedBlock<R (^)(Args...)>(block,
-                                                base::scoped_policy::RETAIN);
-}
-
-#endif  // defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_BIND_H_

include/base/cef_build.h

@@ -1,259 +0,0 @@
-// Copyright (c) 2011 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 adds defines about the platform we're currently building on.
-//
-//  Operating System:
-//    OS_AIX / OS_ANDROID / OS_ASMJS / OS_FREEBSD / OS_FUCHSIA / OS_IOS /
-//    OS_LINUX / OS_MAC / OS_NACL (SFI or NONSFI) / OS_NETBSD / OS_OPENBSD /
-//    OS_QNX / OS_SOLARIS / OS_WIN
-//  Operating System family:
-//    OS_APPLE: IOS or MAC
-//    OS_BSD: FREEBSD or NETBSD or OPENBSD
-//    OS_POSIX: AIX or ANDROID or ASMJS or CHROMEOS or FREEBSD or IOS or LINUX
-//              or MAC or NACL or NETBSD or OPENBSD or QNX or SOLARIS
-//
-//  /!\ Note: OS_CHROMEOS is set by the build system, not this file
-//
-//  Compiler:
-//    COMPILER_MSVC / COMPILER_GCC
-//
-//  Processor:
-//    ARCH_CPU_ARM64 / ARCH_CPU_ARMEL / ARCH_CPU_MIPS / ARCH_CPU_MIPS64 /
-//    ARCH_CPU_MIPS64EL / ARCH_CPU_MIPSEL / ARCH_CPU_PPC64 / ARCH_CPU_S390 /
-//    ARCH_CPU_S390X / ARCH_CPU_X86 / ARCH_CPU_X86_64
-//  Processor family:
-//    ARCH_CPU_ARM_FAMILY: ARMEL or ARM64
-//    ARCH_CPU_MIPS_FAMILY: MIPS64EL or MIPSEL or MIPS64 or MIPS
-//    ARCH_CPU_PPC64_FAMILY: PPC64
-//    ARCH_CPU_S390_FAMILY: S390 or S390X
-//    ARCH_CPU_X86_FAMILY: X86 or X86_64
-//  Processor features:
-//    ARCH_CPU_31_BITS / ARCH_CPU_32_BITS / ARCH_CPU_64_BITS
-//    ARCH_CPU_BIG_ENDIAN / ARCH_CPU_LITTLE_ENDIAN
-
-#ifndef CEF_INCLUDE_BASE_CEF_BUILD_H_
-#define CEF_INCLUDE_BASE_CEF_BUILD_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "build/build_config.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.
-
-// A set of macros to use for platform detection.
-#if defined(ANDROID)
-#define OS_ANDROID 1
-#elif defined(__APPLE__)
-// Only include TargetConditionals after testing ANDROID as some Android builds
-// on the Mac have this header available and it's not needed unless the target
-// is really an Apple platform.
-#include <TargetConditionals.h>
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#define OS_IOS 1
-#else
-#define OS_MAC 1
-// For backwards compatibility.
-#define OS_MACOSX 1
-#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#elif defined(__linux__)
-#if !defined(OS_CHROMEOS)
-// Do not define OS_LINUX on Chrome OS build.
-// The OS_CHROMEOS macro is defined in GN.
-#define OS_LINUX 1
-#endif  // !defined(OS_CHROMEOS)
-// Include a system header to pull in features.h for glibc/uclibc macros.
-#include <unistd.h>
-#if defined(__GLIBC__) && !defined(__UCLIBC__)
-// We really are using glibc, not uClibc pretending to be glibc.
-#define LIBC_GLIBC 1
-#endif
-#elif defined(_WIN32)
-#define OS_WIN 1
-#elif defined(__Fuchsia__)
-#define OS_FUCHSIA 1
-#elif defined(__FreeBSD__)
-#define OS_FREEBSD 1
-#elif defined(__NetBSD__)
-#define OS_NETBSD 1
-#elif defined(__OpenBSD__)
-#define OS_OPENBSD 1
-#elif defined(__sun)
-#define OS_SOLARIS 1
-#elif defined(__QNXNTO__)
-#define OS_QNX 1
-#elif defined(_AIX)
-#define OS_AIX 1
-#elif defined(__asmjs__) || defined(__wasm__)
-#define OS_ASMJS 1
-#else
-#error Please add support for your platform in include/base/cef_build.h
-#endif
-// NOTE: Adding a new port? Please follow
-// https://chromium.googlesource.com/chromium/src/+/master/docs/new_port_policy.md
-
-#if defined(OS_MAC) || defined(OS_IOS)
-#define OS_APPLE 1
-#endif
-
-// For access to standard BSD features, use OS_BSD instead of a
-// more specific macro.
-#if defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD)
-#define OS_BSD 1
-#endif
-
-// For access to standard POSIXish features, use OS_POSIX instead of a
-// more specific macro.
-#if defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_ASMJS) ||  \
-    defined(OS_FREEBSD) || defined(OS_IOS) || defined(OS_LINUX) ||  \
-    defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_NACL) ||  \
-    defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_QNX) || \
-    defined(OS_SOLARIS)
-#define OS_POSIX 1
-#endif
-
-// Compiler detection. Note: clang masquerades as GCC on POSIX and as MSVC on
-// Windows.
-#if defined(__GNUC__)
-#define COMPILER_GCC 1
-#elif defined(_MSC_VER)
-#define COMPILER_MSVC 1
-#else
-#error Please add support for your compiler in build/build_config.h
-#endif
-
-// Processor architecture detection.  For more info on what's defined, see:
-//   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
-//   http://www.agner.org/optimize/calling_conventions.pdf
-//   or with gcc, run: "echo | gcc -E -dM -"
-#if defined(_M_X64) || defined(__x86_64__)
-#define ARCH_CPU_X86_FAMILY 1
-#define ARCH_CPU_X86_64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(_M_IX86) || defined(__i386__)
-#define ARCH_CPU_X86_FAMILY 1
-#define ARCH_CPU_X86 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__s390x__)
-#define ARCH_CPU_S390_FAMILY 1
-#define ARCH_CPU_S390X 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#elif defined(__s390__)
-#define ARCH_CPU_S390_FAMILY 1
-#define ARCH_CPU_S390 1
-#define ARCH_CPU_31_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__)
-#define ARCH_CPU_PPC64_FAMILY 1
-#define ARCH_CPU_PPC64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#elif defined(__PPC64__)
-#define ARCH_CPU_PPC64_FAMILY 1
-#define ARCH_CPU_PPC64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__ARMEL__)
-#define ARCH_CPU_ARM_FAMILY 1
-#define ARCH_CPU_ARMEL 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__aarch64__) || defined(_M_ARM64)
-#define ARCH_CPU_ARM_FAMILY 1
-#define ARCH_CPU_ARM64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__pnacl__) || defined(__asmjs__) || defined(__wasm__)
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__MIPSEL__)
-#if defined(__LP64__)
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPS64EL 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#else
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPSEL 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_LITTLE_ENDIAN 1
-#endif
-#elif defined(__MIPSEB__)
-#if defined(__LP64__)
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPS64 1
-#define ARCH_CPU_64_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#else
-#define ARCH_CPU_MIPS_FAMILY 1
-#define ARCH_CPU_MIPS 1
-#define ARCH_CPU_32_BITS 1
-#define ARCH_CPU_BIG_ENDIAN 1
-#endif
-#else
-#error Please add support for your architecture in include/base/cef_build.h
-#endif
-
-// Type detection for wchar_t.
-#if defined(OS_WIN)
-#define WCHAR_T_IS_UTF16
-#elif defined(OS_FUCHSIA)
-#define WCHAR_T_IS_UTF32
-#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
-    (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
-#define WCHAR_T_IS_UTF32
-#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
-    (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff)
-// On Posix, we'll detect short wchar_t, but projects aren't guaranteed to
-// compile in this mode (in particular, Chrome doesn't). This is intended for
-// other projects using base who manage their own dependencies and make sure
-// short wchar works for them.
-#define WCHAR_T_IS_UTF16
-#else
-#error Please add support for your compiler in include/base/cef_build.h
-#endif
-
-#if defined(OS_ANDROID)
-// The compiler thinks std::string::const_iterator and "const char*" are
-// equivalent types.
-#define STD_STRING_ITERATOR_IS_CHAR_POINTER
-// The compiler thinks std::u16string::const_iterator and "char16*" are
-// equivalent types.
-#define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
-#endif
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_BUILD_H_

include/base/cef_callback.h

@@ -1,251 +0,0 @@
-// 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.
-
-// -----------------------------------------------------------------------------
-// Usage documentation
-// -----------------------------------------------------------------------------
-//
-// Overview:
-// A callback is similar in concept to a function pointer: it wraps a runnable
-// object such as a function, method, lambda, or even another callback, allowing
-// the runnable object to be invoked later via the callback object.
-//
-// Unlike function pointers, callbacks are created with base::BindOnce() or
-// base::BindRepeating() and support partial function application.
-//
-// A base::OnceCallback may be Run() at most once; a base::RepeatingCallback may
-// be Run() any number of times. |is_null()| is guaranteed to return true for a
-// moved-from callback.
-//
-//   // The lambda takes two arguments, but the first argument |x| is bound at
-//   // callback creation.
-//   base::OnceCallback<int(int)> cb = base::BindOnce([] (int x, int y) {
-//     return x + y;
-//   }, 1);
-//   // Run() only needs the remaining unbound argument |y|.
-//   printf("1 + 2 = %d\n", std::move(cb).Run(2));  // Prints 3
-//   printf("cb is null? %s\n",
-//          cb.is_null() ? "true" : "false");  // Prints true
-//   std::move(cb).Run(2);  // Crashes since |cb| has already run.
-//
-// Callbacks also support cancellation. A common use is binding the receiver
-// object as a WeakPtr<T>. If that weak pointer is invalidated, calling Run()
-// will be a no-op. Note that |IsCancelled()| and |is_null()| are distinct:
-// simply cancelling a callback will not also make it null.
-//
-// See https://chromium.googlesource.com/chromium/src/+/HEAD/docs/callback.md
-// for the full documentation.
-
-#ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_H_
-#define CEF_INCLUDE_BASE_CEF_CALLBACK_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/callback.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 <stddef.h>
-
-#include "include/base/cef_bind.h"
-#include "include/base/cef_callback_forward.h"
-#include "include/base/cef_logging.h"
-#include "include/base/internal/cef_callback_internal.h"
-
-namespace base {
-
-template <typename R, typename... Args>
-class OnceCallback<R(Args...)> : public internal::CallbackBase {
- public:
-  using ResultType = R;
-  using RunType = R(Args...);
-  using PolymorphicInvoke = R (*)(internal::BindStateBase*,
-                                  internal::PassingType<Args>...);
-
-  constexpr OnceCallback() = default;
-  OnceCallback(std::nullptr_t) = delete;
-
-  explicit OnceCallback(internal::BindStateBase* bind_state)
-      : internal::CallbackBase(bind_state) {}
-
-  OnceCallback(const OnceCallback&) = delete;
-  OnceCallback& operator=(const OnceCallback&) = delete;
-
-  OnceCallback(OnceCallback&&) noexcept = default;
-  OnceCallback& operator=(OnceCallback&&) noexcept = default;
-
-  OnceCallback(RepeatingCallback<RunType> other)
-      : internal::CallbackBase(std::move(other)) {}
-
-  OnceCallback& operator=(RepeatingCallback<RunType> other) {
-    static_cast<internal::CallbackBase&>(*this) = std::move(other);
-    return *this;
-  }
-
-  R Run(Args... args) const& {
-    static_assert(!sizeof(*this),
-                  "OnceCallback::Run() may only be invoked on a non-const "
-                  "rvalue, i.e. std::move(callback).Run().");
-    NOTREACHED();
-  }
-
-  R Run(Args... args) && {
-    // Move the callback instance into a local variable before the invocation,
-    // that ensures the internal state is cleared after the invocation.
-    // It's not safe to touch |this| after the invocation, since running the
-    // bound function may destroy |this|.
-    OnceCallback cb = std::move(*this);
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(cb.polymorphic_invoke());
-    return f(cb.bind_state_.get(), std::forward<Args>(args)...);
-  }
-
-  // Then() returns a new OnceCallback that receives the same arguments as
-  // |this|, and with the return type of |then|. The returned callback will:
-  // 1) Run the functor currently bound to |this| callback.
-  // 2) Run the |then| callback with the result from step 1 as its single
-  //    argument.
-  // 3) Return the value from running the |then| callback.
-  //
-  // Since this method generates a callback that is a replacement for `this`,
-  // `this` will be consumed and reset to a null callback to ensure the
-  // originally-bound functor can be run at most once.
-  template <typename ThenR, typename... ThenArgs>
-  OnceCallback<ThenR(Args...)> Then(OnceCallback<ThenR(ThenArgs...)> then) && {
-    CHECK(then);
-    return BindOnce(
-        internal::ThenHelper<
-            OnceCallback, OnceCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        std::move(*this), std::move(then));
-  }
-
-  // This overload is required; even though RepeatingCallback is implicitly
-  // convertible to OnceCallback, that conversion will not used when matching
-  // for template argument deduction.
-  template <typename ThenR, typename... ThenArgs>
-  OnceCallback<ThenR(Args...)> Then(
-      RepeatingCallback<ThenR(ThenArgs...)> then) && {
-    CHECK(then);
-    return BindOnce(
-        internal::ThenHelper<
-            OnceCallback,
-            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        std::move(*this), std::move(then));
-  }
-};
-
-template <typename R, typename... Args>
-class RepeatingCallback<R(Args...)> : public internal::CallbackBaseCopyable {
- public:
-  using ResultType = R;
-  using RunType = R(Args...);
-  using PolymorphicInvoke = R (*)(internal::BindStateBase*,
-                                  internal::PassingType<Args>...);
-
-  constexpr RepeatingCallback() = default;
-  RepeatingCallback(std::nullptr_t) = delete;
-
-  explicit RepeatingCallback(internal::BindStateBase* bind_state)
-      : internal::CallbackBaseCopyable(bind_state) {}
-
-  // Copyable and movable.
-  RepeatingCallback(const RepeatingCallback&) = default;
-  RepeatingCallback& operator=(const RepeatingCallback&) = default;
-  RepeatingCallback(RepeatingCallback&&) noexcept = default;
-  RepeatingCallback& operator=(RepeatingCallback&&) noexcept = default;
-
-  bool operator==(const RepeatingCallback& other) const {
-    return EqualsInternal(other);
-  }
-
-  bool operator!=(const RepeatingCallback& other) const {
-    return !operator==(other);
-  }
-
-  R Run(Args... args) const& {
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(this->polymorphic_invoke());
-    return f(this->bind_state_.get(), std::forward<Args>(args)...);
-  }
-
-  R Run(Args... args) && {
-    // Move the callback instance into a local variable before the invocation,
-    // that ensures the internal state is cleared after the invocation.
-    // It's not safe to touch |this| after the invocation, since running the
-    // bound function may destroy |this|.
-    RepeatingCallback cb = std::move(*this);
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(cb.polymorphic_invoke());
-    return f(std::move(cb).bind_state_.get(), std::forward<Args>(args)...);
-  }
-
-  // Then() returns a new RepeatingCallback that receives the same arguments as
-  // |this|, and with the return type of |then|. The
-  // returned callback will:
-  // 1) Run the functor currently bound to |this| callback.
-  // 2) Run the |then| callback with the result from step 1 as its single
-  //    argument.
-  // 3) Return the value from running the |then| callback.
-  //
-  // If called on an rvalue (e.g. std::move(cb).Then(...)), this method
-  // generates a callback that is a replacement for `this`. Therefore, `this`
-  // will be consumed and reset to a null callback to ensure the
-  // originally-bound functor will be run at most once.
-  template <typename ThenR, typename... ThenArgs>
-  RepeatingCallback<ThenR(Args...)> Then(
-      RepeatingCallback<ThenR(ThenArgs...)> then) const& {
-    CHECK(then);
-    return BindRepeating(
-        internal::ThenHelper<
-            RepeatingCallback,
-            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        *this, std::move(then));
-  }
-
-  template <typename ThenR, typename... ThenArgs>
-  RepeatingCallback<ThenR(Args...)> Then(
-      RepeatingCallback<ThenR(ThenArgs...)> then) && {
-    CHECK(then);
-    return BindRepeating(
-        internal::ThenHelper<
-            RepeatingCallback,
-            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
-        std::move(*this), std::move(then));
-  }
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_H_

include/base/cef_callback_forward.h

@@ -1,61 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-#ifndef INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_
-#define INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/callback_forward.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.
-
-namespace base {
-
-template <typename Signature>
-class OnceCallback;
-
-template <typename Signature>
-class RepeatingCallback;
-
-// Syntactic sugar to make OnceClosure<void()> and RepeatingClosure<void()>
-// easier to declare since they will be used in a lot of APIs with delayed
-// execution.
-using OnceClosure = OnceCallback<void()>;
-using RepeatingClosure = RepeatingCallback<void()>;
-
-}  // namespace base
-
-#endif  // !!USING_CHROMIUM_INCLUDES
-
-#endif  // INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_

include/base/cef_callback_helpers.h

@@ -1,241 +0,0 @@
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
-#define CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
-#pragma once
-
-#if 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 <atomic>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "include/base/cef_bind.h"
-#include "include/base/cef_callback.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_logging.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename T>
-struct IsBaseCallbackImpl : std::false_type {};
-
-template <typename R, typename... Args>
-struct IsBaseCallbackImpl<OnceCallback<R(Args...)>> : std::true_type {};
-
-template <typename R, typename... Args>
-struct IsBaseCallbackImpl<RepeatingCallback<R(Args...)>> : std::true_type {};
-
-template <typename T>
-struct IsOnceCallbackImpl : std::false_type {};
-
-template <typename R, typename... Args>
-struct IsOnceCallbackImpl<OnceCallback<R(Args...)>> : std::true_type {};
-
-}  // namespace internal
-
-// IsBaseCallback<T>::value is true when T is any of the Closure or Callback
-// family of types.
-template <typename T>
-using IsBaseCallback = internal::IsBaseCallbackImpl<std::decay_t<T>>;
-
-// IsOnceCallback<T>::value is true when T is a OnceClosure or OnceCallback
-// type.
-template <typename T>
-using IsOnceCallback = internal::IsOnceCallbackImpl<std::decay_t<T>>;
-
-// SFINAE friendly enabler allowing to overload methods for both Repeating and
-// OnceCallbacks.
-//
-// Usage:
-// template <template <typename> class CallbackType,
-//           ... other template args ...,
-//           typename = EnableIfIsBaseCallback<CallbackType>>
-// void DoStuff(CallbackType<...> cb, ...);
-template <template <typename> class CallbackType>
-using EnableIfIsBaseCallback =
-    std::enable_if_t<IsBaseCallback<CallbackType<void()>>::value>;
-
-namespace internal {
-
-template <typename... Args>
-class OnceCallbackHolder final {
- public:
-  OnceCallbackHolder(OnceCallback<void(Args...)> callback,
-                     bool ignore_extra_runs)
-      : callback_(std::move(callback)), ignore_extra_runs_(ignore_extra_runs) {
-    DCHECK(callback_);
-  }
-  OnceCallbackHolder(const OnceCallbackHolder&) = delete;
-  OnceCallbackHolder& operator=(const OnceCallbackHolder&) = delete;
-
-  void Run(Args... args) {
-    if (has_run_.exchange(true)) {
-      CHECK(ignore_extra_runs_) << "Both OnceCallbacks returned by "
-                                   "base::SplitOnceCallback() were run. "
-                                   "At most one of the pair should be run.";
-      return;
-    }
-    DCHECK(callback_);
-    std::move(callback_).Run(std::forward<Args>(args)...);
-  }
-
- private:
-  volatile std::atomic_bool has_run_{false};
-  base::OnceCallback<void(Args...)> callback_;
-  const bool ignore_extra_runs_;
-};
-
-}  // namespace internal
-
-// Wraps the given OnceCallback into a RepeatingCallback that relays its
-// invocation to the original OnceCallback on the first invocation. The
-// following invocations are just ignored.
-//
-// Note that this deliberately subverts the Once/Repeating paradigm of Callbacks
-// but helps ease the migration from old-style Callbacks. Avoid if possible; use
-// if necessary for migration. TODO(tzik): Remove it. https://crbug.com/730593
-template <typename... Args>
-RepeatingCallback<void(Args...)> AdaptCallbackForRepeating(
-    OnceCallback<void(Args...)> callback) {
-  using Helper = internal::OnceCallbackHolder<Args...>;
-  return base::BindRepeating(
-      &Helper::Run, std::make_unique<Helper>(std::move(callback),
-                                             /*ignore_extra_runs=*/true));
-}
-
-// Wraps the given OnceCallback and returns two OnceCallbacks with an identical
-// signature. On first invokation of either returned callbacks, the original
-// callback is invoked. Invoking the remaining callback results in a crash.
-template <typename... Args>
-std::pair<OnceCallback<void(Args...)>, OnceCallback<void(Args...)>>
-SplitOnceCallback(OnceCallback<void(Args...)> callback) {
-  using Helper = internal::OnceCallbackHolder<Args...>;
-  auto wrapped_once = base::BindRepeating(
-      &Helper::Run, std::make_unique<Helper>(std::move(callback),
-                                             /*ignore_extra_runs=*/false));
-  return std::make_pair(wrapped_once, wrapped_once);
-}
-
-// ScopedClosureRunner is akin to std::unique_ptr<> for Closures. It ensures
-// that the Closure is executed no matter how the current scope exits.
-// If you are looking for "ScopedCallback", "CallbackRunner", or
-// "CallbackScoper" this is the class you want.
-class ScopedClosureRunner {
- public:
-  ScopedClosureRunner();
-  explicit ScopedClosureRunner(OnceClosure closure);
-  ScopedClosureRunner(ScopedClosureRunner&& other);
-  // Runs the current closure if it's set, then replaces it with the closure
-  // from |other|. This is akin to how unique_ptr frees the contained pointer in
-  // its move assignment operator. If you need to explicitly avoid running any
-  // current closure, use ReplaceClosure().
-  ScopedClosureRunner& operator=(ScopedClosureRunner&& other);
-  ~ScopedClosureRunner();
-
-  explicit operator bool() const { return !!closure_; }
-
-  // Calls the current closure and resets it, so it wont be called again.
-  void RunAndReset();
-
-  // Replaces closure with the new one releasing the old one without calling it.
-  void ReplaceClosure(OnceClosure closure);
-
-  // Releases the Closure without calling.
-  OnceClosure Release() WARN_UNUSED_RESULT;
-
- private:
-  OnceClosure closure_;
-};
-
-// Creates a null callback.
-class NullCallback {
- public:
-  template <typename R, typename... Args>
-  operator RepeatingCallback<R(Args...)>() const {
-    return RepeatingCallback<R(Args...)>();
-  }
-  template <typename R, typename... Args>
-  operator OnceCallback<R(Args...)>() const {
-    return OnceCallback<R(Args...)>();
-  }
-};
-
-// Creates a callback that does nothing when called.
-class DoNothing {
- public:
-  template <typename... Args>
-  operator RepeatingCallback<void(Args...)>() const {
-    return Repeatedly<Args...>();
-  }
-  template <typename... Args>
-  operator OnceCallback<void(Args...)>() const {
-    return Once<Args...>();
-  }
-  // Explicit way of specifying a specific callback type when the compiler can't
-  // deduce it.
-  template <typename... Args>
-  static RepeatingCallback<void(Args...)> Repeatedly() {
-    return BindRepeating([](Args... args) {});
-  }
-  template <typename... Args>
-  static OnceCallback<void(Args...)> Once() {
-    return BindOnce([](Args... args) {});
-  }
-};
-
-// Useful for creating a Closure that will delete a pointer when invoked. Only
-// use this when necessary. In most cases MessageLoop::DeleteSoon() is a better
-// fit.
-template <typename T>
-void DeletePointer(T* obj) {
-  delete obj;
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_

include/base/cef_callback_list.h

@@ -1,395 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2013
-// 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.
-
-// OVERVIEW:
-//
-// A container for a list of callbacks. Provides callers the ability to manually
-// or automatically unregister callbacks at any time, including during callback
-// notification.
-//
-// TYPICAL USAGE:
-//
-// class MyWidget {
-//  public:
-//   using CallbackList = base::RepeatingCallbackList<void(const Foo&)>;
-//
-//   // Registers |cb| to be called whenever NotifyFoo() is executed.
-//   CallbackListSubscription RegisterCallback(CallbackList::CallbackType cb) {
-//     return callback_list_.Add(std::move(cb));
-//   }
-//
-//  private:
-//   // Calls all registered callbacks, with |foo| as the supplied arg.
-//   void NotifyFoo(const Foo& foo) {
-//     callback_list_.Notify(foo);
-//   }
-//
-//   CallbackList callback_list_;
-// };
-//
-//
-// class MyWidgetListener {
-//  private:
-//   void OnFoo(const Foo& foo) {
-//     // Called whenever MyWidget::NotifyFoo() is executed, unless
-//     // |foo_subscription_| has been destroyed.
-//   }
-//
-//   // Automatically deregisters the callback when deleted (e.g. in
-//   // ~MyWidgetListener()).  Unretained(this) is safe here since the
-//   // ScopedClosureRunner does not outlive |this|.
-//   CallbackListSubscription foo_subscription_ =
-//       MyWidget::Get()->RegisterCallback(
-//           base::BindRepeating(&MyWidgetListener::OnFoo,
-//                               base::Unretained(this)));
-// };
-//
-// UNSUPPORTED:
-//
-// * Destroying the CallbackList during callback notification.
-//
-// This is possible to support, but not currently necessary.
-
-#ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_
-#define CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/callback_list.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 <algorithm>
-#include <list>
-#include <memory>
-#include <utility>
-
-#include "include/base/cef_auto_reset.h"
-#include "include/base/cef_bind.h"
-#include "include/base/cef_callback.h"
-#include "include/base/cef_callback_helpers.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_weak_ptr.h"
-
-namespace base {
-namespace internal {
-template <typename CallbackListImpl>
-class CallbackListBase;
-}  // namespace internal
-
-template <typename Signature>
-class OnceCallbackList;
-
-template <typename Signature>
-class RepeatingCallbackList;
-
-// A trimmed-down version of ScopedClosureRunner that can be used to guarantee a
-// closure is run on destruction. This is designed to be used by
-// CallbackListBase to run CancelCallback() when this subscription dies;
-// consumers can avoid callbacks on dead objects by ensuring the subscription
-// returned by CallbackListBase::Add() does not outlive the bound object in the
-// callback. A typical way to do this is to bind a callback to a member function
-// on `this` and store the returned subscription as a member variable.
-class CallbackListSubscription {
- public:
-  CallbackListSubscription();
-  CallbackListSubscription(CallbackListSubscription&& subscription);
-  CallbackListSubscription& operator=(CallbackListSubscription&& subscription);
-  ~CallbackListSubscription();
-
-  explicit operator bool() const { return !!closure_; }
-
- private:
-  template <typename T>
-  friend class internal::CallbackListBase;
-
-  explicit CallbackListSubscription(base::OnceClosure closure);
-
-  void Run();
-
-  OnceClosure closure_;
-};
-
-namespace internal {
-
-// From base/stl_util.h.
-template <class T, class Allocator, class Predicate>
-size_t EraseIf(std::list<T, Allocator>& container, Predicate pred) {
-  size_t old_size = container.size();
-  container.remove_if(pred);
-  return old_size - container.size();
-}
-
-// A traits class to break circular type dependencies between CallbackListBase
-// and its subclasses.
-template <typename CallbackList>
-struct CallbackListTraits;
-
-// NOTE: It's important that Callbacks provide iterator stability when items are
-// added to the end, so e.g. a std::vector<> is not suitable here.
-template <typename Signature>
-struct CallbackListTraits<OnceCallbackList<Signature>> {
-  using CallbackType = OnceCallback<Signature>;
-  using Callbacks = std::list<CallbackType>;
-};
-template <typename Signature>
-struct CallbackListTraits<RepeatingCallbackList<Signature>> {
-  using CallbackType = RepeatingCallback<Signature>;
-  using Callbacks = std::list<CallbackType>;
-};
-
-template <typename CallbackListImpl>
-class CallbackListBase {
- public:
-  using CallbackType =
-      typename CallbackListTraits<CallbackListImpl>::CallbackType;
-  static_assert(IsBaseCallback<CallbackType>::value, "");
-
-  // TODO(crbug.com/1103086): Update references to use this directly and by
-  // value, then remove.
-  using Subscription = CallbackListSubscription;
-
-  CallbackListBase() = default;
-  CallbackListBase(const CallbackListBase&) = delete;
-  CallbackListBase& operator=(const CallbackListBase&) = delete;
-
-  ~CallbackListBase() {
-    // Destroying the list during iteration is unsupported and will cause a UAF.
-    CHECK(!iterating_);
-  }
-
-  // Registers |cb| for future notifications. Returns a CallbackListSubscription
-  // whose destruction will cancel |cb|.
-  CallbackListSubscription Add(CallbackType cb) WARN_UNUSED_RESULT {
-    DCHECK(!cb.is_null());
-    return CallbackListSubscription(base::BindOnce(
-        &CallbackListBase::CancelCallback, weak_ptr_factory_.GetWeakPtr(),
-        callbacks_.insert(callbacks_.end(), std::move(cb))));
-  }
-
-  // Registers |cb| for future notifications. Provides no way for the caller to
-  // cancel, so this is only safe for cases where the callback is guaranteed to
-  // live at least as long as this list (e.g. if it's bound on the same object
-  // that owns the list).
-  // TODO(pkasting): Attempt to use Add() instead and see if callers can relax
-  // other lifetime/ordering mechanisms as a result.
-  void AddUnsafe(CallbackType cb) {
-    DCHECK(!cb.is_null());
-    callbacks_.push_back(std::move(cb));
-  }
-
-  // Registers |removal_callback| to be run after elements are removed from the
-  // list of registered callbacks.
-  void set_removal_callback(const RepeatingClosure& removal_callback) {
-    removal_callback_ = removal_callback;
-  }
-
-  // Returns whether the list of registered callbacks is empty (from an external
-  // perspective -- meaning no remaining callbacks are live).
-  bool empty() const {
-    return std::all_of(callbacks_.cbegin(), callbacks_.cend(),
-                       [](const auto& callback) { return callback.is_null(); });
-  }
-
-  // Calls all registered callbacks that are not canceled beforehand. If any
-  // callbacks are unregistered, notifies any registered removal callback at the
-  // end.
-  //
-  // Arguments must be copyable, since they must be supplied to all callbacks.
-  // Move-only types would be destructively modified by passing them to the
-  // first callback and not reach subsequent callbacks as intended.
-  //
-  // Notify() may be called re-entrantly, in which case the nested call
-  // completes before the outer one continues. Callbacks are only ever added at
-  // the end and canceled callbacks are not pruned from the list until the
-  // outermost iteration completes, so existing iterators should never be
-  // invalidated. However, this does mean that a callback added during a nested
-  // call can be notified by outer calls -- meaning it will be notified about
-  // things that happened before it was added -- if its subscription outlives
-  // the reentrant Notify() call.
-  template <typename... RunArgs>
-  void Notify(RunArgs&&... args) {
-    if (empty())
-      return;  // Nothing to do.
-
-    {
-      AutoReset<bool> iterating(&iterating_, true);
-
-      // Skip any callbacks that are canceled during iteration.
-      // NOTE: Since RunCallback() may call Add(), it's not safe to cache the
-      // value of callbacks_.end() across loop iterations.
-      const auto next_valid = [this](const auto it) {
-        return std::find_if_not(it, callbacks_.end(), [](const auto& callback) {
-          return callback.is_null();
-        });
-      };
-      for (auto it = next_valid(callbacks_.begin()); it != callbacks_.end();
-           it = next_valid(it))
-        // NOTE: Intentionally does not call std::forward<RunArgs>(args)...,
-        // since that would allow move-only arguments.
-        static_cast<CallbackListImpl*>(this)->RunCallback(it++, args...);
-    }
-
-    // Re-entrant invocations shouldn't prune anything from the list. This can
-    // invalidate iterators from underneath higher call frames. It's safe to
-    // simply do nothing, since the outermost frame will continue through here
-    // and prune all null callbacks below.
-    if (iterating_)
-      return;
-
-    // Any null callbacks remaining in the list were canceled due to
-    // Subscription destruction during iteration, and can safely be erased now.
-    const size_t erased_callbacks =
-        EraseIf(callbacks_, [](const auto& cb) { return cb.is_null(); });
-
-    // Run |removal_callback_| if any callbacks were canceled. Note that we
-    // cannot simply compare list sizes before and after iterating, since
-    // notification may result in Add()ing new callbacks as well as canceling
-    // them. Also note that if this is a OnceCallbackList, the OnceCallbacks
-    // that were executed above have all been removed regardless of whether
-    // they're counted in |erased_callbacks_|.
-    if (removal_callback_ &&
-        (erased_callbacks || IsOnceCallback<CallbackType>::value))
-      removal_callback_.Run();  // May delete |this|!
-  }
-
- protected:
-  using Callbacks = typename CallbackListTraits<CallbackListImpl>::Callbacks;
-
-  // Holds non-null callbacks, which will be called during Notify().
-  Callbacks callbacks_;
-
- private:
-  // Cancels the callback pointed to by |it|, which is guaranteed to be valid.
-  void CancelCallback(const typename Callbacks::iterator& it) {
-    if (static_cast<CallbackListImpl*>(this)->CancelNullCallback(it))
-      return;
-
-    if (iterating_) {
-      // Calling erase() here is unsafe, since the loop in Notify() may be
-      // referencing this same iterator, e.g. if adjacent callbacks'
-      // Subscriptions are both destroyed when the first one is Run().  Just
-      // reset the callback and let Notify() clean it up at the end.
-      it->Reset();
-    } else {
-      callbacks_.erase(it);
-      if (removal_callback_)
-        removal_callback_.Run();  // May delete |this|!
-    }
-  }
-
-  // Set while Notify() is traversing |callbacks_|.  Used primarily to avoid
-  // invalidating iterators that may be in use.
-  bool iterating_ = false;
-
-  // Called after elements are removed from |callbacks_|.
-  RepeatingClosure removal_callback_;
-
-  WeakPtrFactory<CallbackListBase> weak_ptr_factory_{this};
-};
-
-}  // namespace internal
-
-template <typename Signature>
-class OnceCallbackList
-    : public internal::CallbackListBase<OnceCallbackList<Signature>> {
- private:
-  friend internal::CallbackListBase<OnceCallbackList>;
-  using Traits = internal::CallbackListTraits<OnceCallbackList>;
-
-  // Runs the current callback, which may cancel it or any other callbacks.
-  template <typename... RunArgs>
-  void RunCallback(typename Traits::Callbacks::iterator it, RunArgs&&... args) {
-    // OnceCallbacks still have Subscriptions with outstanding iterators;
-    // splice() removes them from |callbacks_| without invalidating those.
-    null_callbacks_.splice(null_callbacks_.end(), this->callbacks_, it);
-
-    // NOTE: Intentionally does not call std::forward<RunArgs>(args)...; see
-    // comments in Notify().
-    std::move(*it).Run(args...);
-  }
-
-  // If |it| refers to an already-canceled callback, does any necessary cleanup
-  // and returns true.  Otherwise returns false.
-  bool CancelNullCallback(const typename Traits::Callbacks::iterator& it) {
-    if (it->is_null()) {
-      null_callbacks_.erase(it);
-      return true;
-    }
-    return false;
-  }
-
-  // Holds null callbacks whose Subscriptions are still alive, so the
-  // Subscriptions will still contain valid iterators.  Only needed for
-  // OnceCallbacks, since RepeatingCallbacks are not canceled except by
-  // Subscription destruction.
-  typename Traits::Callbacks null_callbacks_;
-};
-
-template <typename Signature>
-class RepeatingCallbackList
-    : public internal::CallbackListBase<RepeatingCallbackList<Signature>> {
- private:
-  friend internal::CallbackListBase<RepeatingCallbackList>;
-  using Traits = internal::CallbackListTraits<RepeatingCallbackList>;
-  // Runs the current callback, which may cancel it or any other callbacks.
-  template <typename... RunArgs>
-  void RunCallback(typename Traits::Callbacks::iterator it, RunArgs&&... args) {
-    // NOTE: Intentionally does not call std::forward<RunArgs>(args)...; see
-    // comments in Notify().
-    it->Run(args...);
-  }
-
-  // If |it| refers to an already-canceled callback, does any necessary cleanup
-  // and returns true.  Otherwise returns false.
-  bool CancelNullCallback(const typename Traits::Callbacks::iterator& it) {
-    // Because at most one Subscription can point to a given callback, and
-    // RepeatingCallbacks are only reset by CancelCallback(), no one should be
-    // able to request cancellation of a canceled RepeatingCallback.
-    DCHECK(!it->is_null());
-    return false;
-  }
-};
-
-// Syntactic sugar to parallel that used for Callbacks.
-// ClosureList explicitly not provided since it is not used, and CallbackList
-// is deprecated. {Once,Repeating}ClosureList should instead be used.
-using OnceClosureList = OnceCallbackList<void()>;
-using RepeatingClosureList = RepeatingCallbackList<void()>;
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_

include/base/cef_cancelable_callback.h

@@ -1,185 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-// CancelableCallback is a wrapper around base::Callback that allows
-// cancellation of a callback. CancelableCallback takes a reference on the
-// wrapped callback until this object is destroyed or Reset()/Cancel() are
-// called.
-//
-// NOTE:
-//
-// Calling CancelableCallback::Cancel() brings the object back to its natural,
-// default-constructed state, i.e., CancelableCallback::callback() will return
-// a null callback.
-//
-// THREAD-SAFETY:
-//
-// CancelableCallback objects must be created on, posted to, cancelled on, and
-// destroyed on the same thread.
-//
-//
-// EXAMPLE USAGE:
-//
-// In the following example, the test is verifying that RunIntensiveTest()
-// Quit()s the message loop within 4 seconds. The cancelable callback is posted
-// to the message loop, the intensive test runs, the message loop is run,
-// then the callback is cancelled.
-//
-// RunLoop run_loop;
-//
-// void TimeoutCallback(const std::string& timeout_message) {
-//   FAIL() << timeout_message;
-//   run_loop.QuitWhenIdle();
-// }
-//
-// CancelableOnceClosure timeout(
-//     base::BindOnce(&TimeoutCallback, "Test timed out."));
-// ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE, timeout.callback(),
-//                                                TimeDelta::FromSeconds(4));
-// RunIntensiveTest();
-// run_loop.Run();
-// timeout.Cancel();  // Hopefully this is hit before the timeout callback runs.
-
-#ifndef CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_
-#define CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/cancelable_callback.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 <utility>
-
-#include "include/base/cef_bind.h"
-#include "include/base/cef_callback.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_weak_ptr.h"
-#include "include/base/internal/cef_callback_internal.h"
-
-namespace base {
-namespace internal {
-
-template <typename CallbackType>
-class CancelableCallbackImpl {
- public:
-  CancelableCallbackImpl() = default;
-  CancelableCallbackImpl(const CancelableCallbackImpl&) = delete;
-  CancelableCallbackImpl& operator=(const CancelableCallbackImpl&) = delete;
-
-  // |callback| must not be null.
-  explicit CancelableCallbackImpl(CallbackType callback)
-      : callback_(std::move(callback)) {
-    DCHECK(callback_);
-  }
-
-  ~CancelableCallbackImpl() = default;
-
-  // Cancels and drops the reference to the wrapped callback.
-  void Cancel() {
-    weak_ptr_factory_.InvalidateWeakPtrs();
-    callback_.Reset();
-  }
-
-  // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const { return callback_.is_null(); }
-
-  // Sets |callback| as the closure that may be cancelled. |callback| may not
-  // be null. Outstanding and any previously wrapped callbacks are cancelled.
-  void Reset(CallbackType callback) {
-    DCHECK(callback);
-    // Outstanding tasks (e.g., posted to a message loop) must not be called.
-    Cancel();
-    callback_ = std::move(callback);
-  }
-
-  // Returns a callback that can be disabled by calling Cancel().
-  CallbackType callback() const {
-    if (!callback_)
-      return CallbackType();
-    CallbackType forwarder;
-    MakeForwarder(&forwarder);
-    return forwarder;
-  }
-
- private:
-  template <typename... Args>
-  void MakeForwarder(RepeatingCallback<void(Args...)>* out) const {
-    using ForwarderType = void (CancelableCallbackImpl::*)(Args...);
-    ForwarderType forwarder = &CancelableCallbackImpl::ForwardRepeating;
-    *out = BindRepeating(forwarder, weak_ptr_factory_.GetWeakPtr());
-  }
-
-  template <typename... Args>
-  void MakeForwarder(OnceCallback<void(Args...)>* out) const {
-    using ForwarderType = void (CancelableCallbackImpl::*)(Args...);
-    ForwarderType forwarder = &CancelableCallbackImpl::ForwardOnce;
-    *out = BindOnce(forwarder, weak_ptr_factory_.GetWeakPtr());
-  }
-
-  template <typename... Args>
-  void ForwardRepeating(Args... args) {
-    callback_.Run(std::forward<Args>(args)...);
-  }
-
-  template <typename... Args>
-  void ForwardOnce(Args... args) {
-    weak_ptr_factory_.InvalidateWeakPtrs();
-    std::move(callback_).Run(std::forward<Args>(args)...);
-  }
-
-  // The stored closure that may be cancelled.
-  CallbackType callback_;
-  mutable base::WeakPtrFactory<CancelableCallbackImpl> weak_ptr_factory_{this};
-};
-
-}  // namespace internal
-
-// Consider using base::WeakPtr directly instead of base::CancelableCallback for
-// the task cancellation.
-template <typename Signature>
-using CancelableOnceCallback =
-    internal::CancelableCallbackImpl<OnceCallback<Signature>>;
-using CancelableOnceClosure = CancelableOnceCallback<void()>;
-
-template <typename Signature>
-using CancelableRepeatingCallback =
-    internal::CancelableCallbackImpl<RepeatingCallback<Signature>>;
-using CancelableRepeatingClosure = CancelableRepeatingCallback<void()>;
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_

include/base/cef_compiler_specific.h

@@ -1,411 +0,0 @@
-// Copyright (c) 2021 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
-#define CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/compiler_specific.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_build.h"
-
-// This is a wrapper around `__has_cpp_attribute`, which can be used to test for
-// the presence of an attribute. In case the compiler does not support this
-// macro it will simply evaluate to 0.
-//
-// References:
-// https://wg21.link/sd6#testing-for-the-presence-of-an-attribute-__has_cpp_attribute
-// https://wg21.link/cpp.cond#:__has_cpp_attribute
-#if defined(__has_cpp_attribute)
-#define HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-#define HAS_CPP_ATTRIBUTE(x) 0
-#endif
-
-// A wrapper around `__has_builtin`, similar to HAS_CPP_ATTRIBUTE.
-#if defined(__has_builtin)
-#define HAS_BUILTIN(x) __has_builtin(x)
-#else
-#define HAS_BUILTIN(x) 0
-#endif
-
-// __has_feature and __has_attribute don't exist for MSVC.
-#if !defined(__has_feature)
-#define __has_feature(x) 0
-#endif  // !defined(__has_feature)
-
-#if !defined(__has_attribute)
-#define __has_attribute(x) 0
-#endif  // !defined(__has_attribute)
-
-// Annotate a function indicating it should not be inlined.
-// Use like:
-//   NOINLINE void DoStuff() { ... }
-#if defined(COMPILER_GCC)
-#define NOINLINE __attribute__((noinline))
-#elif defined(COMPILER_MSVC)
-#define NOINLINE __declspec(noinline)
-#else
-#define NOINLINE
-#endif
-
-#if defined(COMPILER_GCC) && defined(NDEBUG)
-#define ALWAYS_INLINE inline __attribute__((__always_inline__))
-#elif defined(COMPILER_MSVC) && defined(NDEBUG)
-#define ALWAYS_INLINE __forceinline
-#else
-#define ALWAYS_INLINE inline
-#endif
-
-// Annotate a function indicating it should never be tail called. Useful to make
-// sure callers of the annotated function are never omitted from call-stacks.
-// To provide the complementary behavior (prevent the annotated function from
-// being omitted) look at NOINLINE. Also note that this doesn't prevent code
-// folding of multiple identical caller functions into a single signature. To
-// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
-// Use like:
-//   void NOT_TAIL_CALLED FooBar();
-#if defined(__clang__) && __has_attribute(not_tail_called)
-#define NOT_TAIL_CALLED __attribute__((not_tail_called))
-#else
-#define NOT_TAIL_CALLED
-#endif
-
-// Specify memory alignment for structs, classes, etc.
-// Use like:
-//   class ALIGNAS(16) MyClass { ... }
-//   ALIGNAS(16) int array[4];
-//
-// In most places you can use the C++11 keyword "alignas", which is preferred.
-//
-// But compilers have trouble mixing __attribute__((...)) syntax with
-// alignas(...) syntax.
-//
-// Doesn't work in clang or gcc:
-//   struct alignas(16) __attribute__((packed)) S { char c; };
-// Works in clang but not gcc:
-//   struct __attribute__((packed)) alignas(16) S2 { char c; };
-// Works in clang and gcc:
-//   struct alignas(16) S3 { char c; } __attribute__((packed));
-//
-// There are also some attributes that must be specified *before* a class
-// definition: visibility (used for exporting functions/classes) is one of
-// these attributes. This means that it is not possible to use alignas() with a
-// class that is marked as exported.
-#if defined(COMPILER_MSVC)
-#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-#elif defined(COMPILER_GCC)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-#endif
-
-// In case the compiler supports it NO_UNIQUE_ADDRESS evaluates to the C++20
-// attribute [[no_unique_address]]. This allows annotating data members so that
-// they need not have an address distinct from all other non-static data members
-// of its class.
-//
-// References:
-// * https://en.cppreference.com/w/cpp/language/attributes/no_unique_address
-// * https://wg21.link/dcl.attr.nouniqueaddr
-#if HAS_CPP_ATTRIBUTE(no_unique_address)
-#define NO_UNIQUE_ADDRESS [[no_unique_address]]
-#else
-#define NO_UNIQUE_ADDRESS
-#endif
-
-// Tell the compiler a function is using a printf-style format string.
-// |format_param| is the one-based index of the format string parameter;
-// |dots_param| is the one-based index of the "..." parameter.
-// For v*printf functions (which take a va_list), pass 0 for dots_param.
-// (This is undocumented but matches what the system C headers do.)
-// For member functions, the implicit this parameter counts as index 1.
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define PRINTF_FORMAT(format_param, dots_param) \
-  __attribute__((format(printf, format_param, dots_param)))
-#else
-#define PRINTF_FORMAT(format_param, dots_param)
-#endif
-
-// WPRINTF_FORMAT is the same, but for wide format strings.
-// This doesn't appear to yet be implemented in any compiler.
-// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38308 .
-#define WPRINTF_FORMAT(format_param, dots_param)
-// If available, it would look like:
-//   __attribute__((format(wprintf, format_param, dots_param)))
-
-// Sanitizers annotations.
-#if defined(__has_attribute)
-#if __has_attribute(no_sanitize)
-#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
-#endif
-#endif
-#if !defined(NO_SANITIZE)
-#define NO_SANITIZE(what)
-#endif
-
-// MemorySanitizer annotations.
-#if defined(MEMORY_SANITIZER) && !defined(OS_NACL)
-#include <sanitizer/msan_interface.h>
-
-// Mark a memory region fully initialized.
-// Use this to annotate code that deliberately reads uninitialized data, for
-// example a GC scavenging root set pointers from the stack.
-#define MSAN_UNPOISON(p, size) __msan_unpoison(p, size)
-
-// Check a memory region for initializedness, as if it was being used here.
-// If any bits are uninitialized, crash with an MSan report.
-// Use this to sanitize data which MSan won't be able to track, e.g. before
-// passing data to another process via shared memory.
-#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size) \
-  __msan_check_mem_is_initialized(p, size)
-#else  // MEMORY_SANITIZER
-#define MSAN_UNPOISON(p, size)
-#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size)
-#endif  // MEMORY_SANITIZER
-
-// DISABLE_CFI_PERF -- Disable Control Flow Integrity for perf reasons.
-#if !defined(DISABLE_CFI_PERF)
-#if defined(__clang__) && defined(OFFICIAL_BUILD)
-#define DISABLE_CFI_PERF __attribute__((no_sanitize("cfi")))
-#else
-#define DISABLE_CFI_PERF
-#endif
-#endif
-
-// DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks.
-#if !defined(DISABLE_CFI_ICALL)
-#if defined(OS_WIN)
-// Windows also needs __declspec(guard(nocf)).
-#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf))
-#else
-#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall")
-#endif
-#endif
-#if !defined(DISABLE_CFI_ICALL)
-#define DISABLE_CFI_ICALL
-#endif
-
-// Macro useful for writing cross-platform function pointers.
-#if !defined(CDECL)
-#if defined(OS_WIN)
-#define CDECL __cdecl
-#else  // defined(OS_WIN)
-#define CDECL
-#endif  // defined(OS_WIN)
-#endif  // !defined(CDECL)
-
-// Macro for hinting that an expression is likely to be false.
-#if !defined(UNLIKELY)
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define UNLIKELY(x) (x)
-#endif  // defined(COMPILER_GCC)
-#endif  // !defined(UNLIKELY)
-
-#if !defined(LIKELY)
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define LIKELY(x) __builtin_expect(!!(x), 1)
-#else
-#define LIKELY(x) (x)
-#endif  // defined(COMPILER_GCC)
-#endif  // !defined(LIKELY)
-
-// Compiler feature-detection.
-// clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
-#if defined(__has_feature)
-#define HAS_FEATURE(FEATURE) __has_feature(FEATURE)
-#else
-#define HAS_FEATURE(FEATURE) 0
-#endif
-
-// Macro for telling -Wimplicit-fallthrough that a fallthrough is intentional.
-#if defined(__clang__)
-#define FALLTHROUGH [[clang::fallthrough]]
-#else
-#define FALLTHROUGH
-#endif
-
-#if defined(COMPILER_GCC)
-#define PRETTY_FUNCTION __PRETTY_FUNCTION__
-#elif defined(COMPILER_MSVC)
-#define PRETTY_FUNCTION __FUNCSIG__
-#else
-// See https://en.cppreference.com/w/c/language/function_definition#func
-#define PRETTY_FUNCTION __func__
-#endif
-
-#if !defined(CPU_ARM_NEON)
-#if defined(__arm__)
-#if !defined(__ARMEB__) && !defined(__ARM_EABI__) && !defined(__EABI__) && \
-    !defined(__VFP_FP__) && !defined(_WIN32_WCE) && !defined(ANDROID)
-#error Chromium does not support middle endian architecture
-#endif
-#if defined(__ARM_NEON__)
-#define CPU_ARM_NEON 1
-#endif
-#endif  // defined(__arm__)
-#endif  // !defined(CPU_ARM_NEON)
-
-#if !defined(HAVE_MIPS_MSA_INTRINSICS)
-#if defined(__mips_msa) && defined(__mips_isa_rev) && (__mips_isa_rev >= 5)
-#define HAVE_MIPS_MSA_INTRINSICS 1
-#endif
-#endif
-
-#if defined(__clang__) && __has_attribute(uninitialized)
-// Attribute "uninitialized" disables -ftrivial-auto-var-init=pattern for
-// the specified variable.
-// Library-wide alternative is
-// 'configs -= [ "//build/config/compiler:default_init_stack_vars" ]' in .gn
-// file.
-//
-// See "init_stack_vars" in build/config/compiler/BUILD.gn and
-// http://crbug.com/977230
-// "init_stack_vars" is enabled for non-official builds and we hope to enable it
-// in official build in 2020 as well. The flag writes fixed pattern into
-// uninitialized parts of all local variables. In rare cases such initialization
-// is undesirable and attribute can be used:
-//   1. Degraded performance
-// In most cases compiler is able to remove additional stores. E.g. if memory is
-// never accessed or properly initialized later. Preserved stores mostly will
-// not affect program performance. However if compiler failed on some
-// performance critical code we can get a visible regression in a benchmark.
-//   2. memset, memcpy calls
-// Compiler may replaces some memory writes with memset or memcpy calls. This is
-// not -ftrivial-auto-var-init specific, but it can happen more likely with the
-// flag. It can be a problem if code is not linked with C run-time library.
-//
-// Note: The flag is security risk mitigation feature. So in future the
-// attribute uses should be avoided when possible. However to enable this
-// mitigation on the most of the code we need to be less strict now and minimize
-// number of exceptions later. So if in doubt feel free to use attribute, but
-// please document the problem for someone who is going to cleanup it later.
-// E.g. platform, bot, benchmark or test name in patch description or next to
-// the attribute.
-#define STACK_UNINITIALIZED __attribute__((uninitialized))
-#else
-#define STACK_UNINITIALIZED
-#endif
-
-// The ANALYZER_ASSUME_TRUE(bool arg) macro adds compiler-specific hints
-// to Clang which control what code paths are statically analyzed,
-// and is meant to be used in conjunction with assert & assert-like functions.
-// The expression is passed straight through if analysis isn't enabled.
-//
-// ANALYZER_SKIP_THIS_PATH() suppresses static analysis for the current
-// codepath and any other branching codepaths that might follow.
-#if defined(__clang_analyzer__)
-
-inline constexpr bool AnalyzerNoReturn() __attribute__((analyzer_noreturn)) {
-  return false;
-}
-
-inline constexpr bool AnalyzerAssumeTrue(bool arg) {
-  // AnalyzerNoReturn() is invoked and analysis is terminated if |arg| is
-  // false.
-  return arg || AnalyzerNoReturn();
-}
-
-#define ANALYZER_ASSUME_TRUE(arg) ::AnalyzerAssumeTrue(!!(arg))
-#define ANALYZER_SKIP_THIS_PATH() static_cast<void>(::AnalyzerNoReturn())
-#define ANALYZER_ALLOW_UNUSED(var) static_cast<void>(var);
-
-#else  // !defined(__clang_analyzer__)
-
-#define ANALYZER_ASSUME_TRUE(arg) (arg)
-#define ANALYZER_SKIP_THIS_PATH()
-#define ANALYZER_ALLOW_UNUSED(var) static_cast<void>(var);
-
-#endif  // defined(__clang_analyzer__)
-
-// Use nomerge attribute to disable optimization of merging multiple same calls.
-#if defined(__clang__) && __has_attribute(nomerge)
-#define NOMERGE [[clang::nomerge]]
-#else
-#define NOMERGE
-#endif
-
-// Marks a type as being eligible for the "trivial" ABI despite having a
-// non-trivial destructor or copy/move constructor. Such types can be relocated
-// after construction by simply copying their memory, which makes them eligible
-// to be passed in registers. The canonical example is std::unique_ptr.
-//
-// Use with caution; this has some subtle effects on constructor/destructor
-// ordering and will be very incorrect if the type relies on its address
-// remaining constant. When used as a function argument (by value), the value
-// may be constructed in the caller's stack frame, passed in a register, and
-// then used and destructed in the callee's stack frame. A similar thing can
-// occur when values are returned.
-//
-// TRIVIAL_ABI is not needed for types which have a trivial destructor and
-// copy/move constructors, such as base::TimeTicks and other POD.
-//
-// It is also not likely to be effective on types too large to be passed in one
-// or two registers on typical target ABIs.
-//
-// See also:
-//   https://clang.llvm.org/docs/AttributeReference.html#trivial-abi
-//   https://libcxx.llvm.org/docs/DesignDocs/UniquePtrTrivialAbi.html
-#if defined(__clang__) && __has_attribute(trivial_abi)
-#define TRIVIAL_ABI [[clang::trivial_abi]]
-#else
-#define TRIVIAL_ABI
-#endif
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-// Annotate a function indicating the caller must examine the return value.
-// Use like:
-//   int foo() WARN_UNUSED_RESULT;
-// To explicitly ignore a result, use std::ignore from <tuple>.
-// Alternately use `[[nodiscard]]` with code that supports C++17.
-#undef WARN_UNUSED_RESULT
-#if defined(COMPILER_GCC) || defined(__clang__)
-#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-#define WARN_UNUSED_RESULT
-#endif
-
-// Annotate a variable indicating it's ok if the variable is not used.
-// (Typically used to silence a compiler warning when the assignment
-// is important for some other reason.)
-// Use like:
-//   int x = ...;
-//   ALLOW_UNUSED_LOCAL(x);
-// Alternately use `[[maybe_unused]]` with code that supports C++17.
-#define ALLOW_UNUSED_LOCAL(x) (void)x
-
-#endif  // CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_

include/base/cef_cxx17_backports.h

@@ -1,133 +0,0 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2021
-// 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.
-//
-
-#ifndef CEF_INCLUDE_BASE_CEF_CXX17_BACKPORTS_H_
-#define CEF_INCLUDE_BASE_CEF_CXX17_BACKPORTS_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-// TODO(cef): Change to "base/cxx17_backports.h" in M93.
-#include "base/stl_util.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 <array>
-#include <initializer_list>
-#include <memory>
-#include <string>
-
-namespace base {
-
-// C++14 implementation of C++17's std::size():
-// http://en.cppreference.com/w/cpp/iterator/size
-template <typename Container>
-constexpr auto size(const Container& c) -> decltype(c.size()) {
-  return c.size();
-}
-
-template <typename T, size_t N>
-constexpr size_t size(const T (&array)[N]) noexcept {
-  return N;
-}
-
-// C++14 implementation of C++17's std::empty():
-// http://en.cppreference.com/w/cpp/iterator/empty
-template <typename Container>
-constexpr auto empty(const Container& c) -> decltype(c.empty()) {
-  return c.empty();
-}
-
-template <typename T, size_t N>
-constexpr bool empty(const T (&array)[N]) noexcept {
-  return false;
-}
-
-template <typename T>
-constexpr bool empty(std::initializer_list<T> il) noexcept {
-  return il.size() == 0;
-}
-
-// C++14 implementation of C++17's std::data():
-// http://en.cppreference.com/w/cpp/iterator/data
-template <typename Container>
-constexpr auto data(Container& c) -> decltype(c.data()) {
-  return c.data();
-}
-
-// std::basic_string::data() had no mutable overload prior to C++17 [1].
-// Hence this overload is provided.
-// Note: str[0] is safe even for empty strings, as they are guaranteed to be
-// null-terminated [2].
-//
-// [1] http://en.cppreference.com/w/cpp/string/basic_string/data
-// [2] http://en.cppreference.com/w/cpp/string/basic_string/operator_at
-template <typename CharT, typename Traits, typename Allocator>
-CharT* data(std::basic_string<CharT, Traits, Allocator>& str) {
-  return std::addressof(str[0]);
-}
-
-template <typename Container>
-constexpr auto data(const Container& c) -> decltype(c.data()) {
-  return c.data();
-}
-
-template <typename T, size_t N>
-constexpr T* data(T (&array)[N]) noexcept {
-  return array;
-}
-
-template <typename T>
-constexpr const T* data(std::initializer_list<T> il) noexcept {
-  return il.begin();
-}
-
-// std::array::data() was not constexpr prior to C++17 [1].
-// Hence these overloads are provided.
-//
-// [1] https://en.cppreference.com/w/cpp/container/array/data
-template <typename T, size_t N>
-constexpr T* data(std::array<T, N>& array) noexcept {
-  return !array.empty() ? &array[0] : nullptr;
-}
-
-template <typename T, size_t N>
-constexpr const T* data(const std::array<T, N>& array) noexcept {
-  return !array.empty() ? &array[0] : nullptr;
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_CXX17_BACKPORTS_H_

include/base/cef_lock.h

@@ -1,174 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_LOCK_H_
-#define CEF_INCLUDE_BASE_CEF_LOCK_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/synchronization/lock.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_logging.h"
-#include "include/base/cef_platform_thread.h"
-#include "include/base/internal/cef_lock_impl.h"
-
-namespace base {
-namespace cef_internal {
-
-// A convenient wrapper for an OS specific critical section.  The only real
-// intelligence in this class is in debug mode for the support for the
-// AssertAcquired() method.
-class Lock {
- public:
-#if !DCHECK_IS_ON()  // Optimized wrapper implementation
-  Lock() : lock_() {}
-
-  Lock(const Lock&) = delete;
-  Lock& operator=(const Lock&) = delete;
-
-  ~Lock() {}
-  void Acquire() { lock_.Lock(); }
-  void Release() { lock_.Unlock(); }
-
-  // If the lock is not held, take it and return true. If the lock is already
-  // held by another thread, immediately return false. This must not be called
-  // by a thread already holding the lock (what happens is undefined and an
-  // assertion may fail).
-  bool Try() { return lock_.Try(); }
-
-  // Null implementation if not debug.
-  void AssertAcquired() const {}
-#else
-  Lock();
-  ~Lock();
-
-  // NOTE: Although windows critical sections support recursive locks, we do not
-  // allow this, and we will commonly fire a DCHECK() if a thread attempts to
-  // acquire the lock a second time (while already holding it).
-  void Acquire() {
-    lock_.Lock();
-    CheckUnheldAndMark();
-  }
-  void Release() {
-    CheckHeldAndUnmark();
-    lock_.Unlock();
-  }
-
-  bool Try() {
-    bool rv = lock_.Try();
-    if (rv) {
-      CheckUnheldAndMark();
-    }
-    return rv;
-  }
-
-  void AssertAcquired() const;
-#endif  // !DCHECK_IS_ON()
-
- private:
-#if DCHECK_IS_ON()
-  // Members and routines taking care of locks assertions.
-  // Note that this checks for recursive locks and allows them
-  // if the variable is set.  This is allowed by the underlying implementation
-  // on windows but not on Posix, so we're doing unneeded checks on Posix.
-  // It's worth it to share the code.
-  void CheckHeldAndUnmark();
-  void CheckUnheldAndMark();
-
-  // All private data is implicitly protected by lock_.
-  // Be VERY careful to only access members under that lock.
-  base::PlatformThreadRef owning_thread_ref_;
-#endif  // DCHECK_IS_ON()
-
-  // Platform specific underlying lock implementation.
-  LockImpl lock_;
-};
-
-// A helper class that acquires the given Lock while the AutoLock is in scope.
-class AutoLock {
- public:
-  struct AlreadyAcquired {};
-
-  explicit AutoLock(Lock& lock) : lock_(lock) { lock_.Acquire(); }
-
-  AutoLock(Lock& lock, const AlreadyAcquired&) : lock_(lock) {
-    lock_.AssertAcquired();
-  }
-
-  AutoLock(const AutoLock&) = delete;
-  AutoLock& operator=(const AutoLock&) = delete;
-
-  ~AutoLock() {
-    lock_.AssertAcquired();
-    lock_.Release();
-  }
-
- private:
-  Lock& lock_;
-};
-
-// AutoUnlock is a helper that will Release() the |lock| argument in the
-// constructor, and re-Acquire() it in the destructor.
-class AutoUnlock {
- public:
-  explicit AutoUnlock(Lock& lock) : lock_(lock) {
-    // We require our caller to have the lock.
-    lock_.AssertAcquired();
-    lock_.Release();
-  }
-
-  AutoUnlock(const AutoUnlock&) = delete;
-  AutoUnlock& operator=(const AutoUnlock&) = delete;
-
-  ~AutoUnlock() { lock_.Acquire(); }
-
- private:
-  Lock& lock_;
-};
-
-}  // namespace cef_internal
-
-// Implement classes in the cef_internal namespace and then expose them to the
-// base namespace. This avoids conflicts with the base.lib implementation when
-// linking sandbox support on Windows.
-using cef_internal::AutoLock;
-using cef_internal::AutoUnlock;
-using cef_internal::Lock;
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_LOCK_H_

include/base/cef_logging.h

@@ -1,758 +0,0 @@
-// 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.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file are only available to applications that link
-// against the libcef_dll_wrapper target.
-//
-// WARNING: Logging macros should not be used in the main/browser process before
-// calling CefInitialize or in sub-processes before calling CefExecuteProcess.
-//
-// Instructions
-// ------------
-//
-// Make a bunch of macros for logging.  The way to log things is to stream
-// things to LOG(<a particular severity level>).  E.g.,
-//
-//   LOG(INFO) << "Found " << num_cookies << " cookies";
-//
-// You can also do conditional logging:
-//
-//   LOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
-//
-// The CHECK(condition) macro is active in both debug and release builds and
-// effectively performs a LOG(FATAL) which terminates the process and
-// generates a crashdump unless a debugger is attached.
-//
-// There are also "debug mode" logging macros like the ones above:
-//
-//   DLOG(INFO) << "Found cookies";
-//
-//   DLOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
-//
-// All "debug mode" logging is compiled away to nothing for non-debug mode
-// compiles.  LOG_IF and development flags also work well together
-// because the code can be compiled away sometimes.
-//
-// We also have
-//
-//   LOG_ASSERT(assertion);
-//   DLOG_ASSERT(assertion);
-//
-// which is syntactic sugar for {,D}LOG_IF(FATAL, assert fails) << assertion;
-//
-// There are "verbose level" logging macros.  They look like
-//
-//   VLOG(1) << "I'm printed when you run the program with --v=1 or more";
-//   VLOG(2) << "I'm printed when you run the program with --v=2 or more";
-//
-// These always log at the INFO log level (when they log at all).
-// The verbose logging can also be turned on module-by-module.  For instance,
-//    --vmodule=profile=2,icon_loader=1,browser_*=3,*/chromeos/*=4 --v=0
-// will cause:
-//   a. VLOG(2) and lower messages to be printed from profile.{h,cc}
-//   b. VLOG(1) and lower messages to be printed from icon_loader.{h,cc}
-//   c. VLOG(3) and lower messages to be printed from files prefixed with
-//      "browser"
-//   d. VLOG(4) and lower messages to be printed from files under a
-//     "chromeos" directory.
-//   e. VLOG(0) and lower messages to be printed from elsewhere
-//
-// The wildcarding functionality shown by (c) supports both '*' (match
-// 0 or more characters) and '?' (match any single character)
-// wildcards.  Any pattern containing a forward or backward slash will
-// be tested against the whole pathname and not just the module.
-// E.g., "*/foo/bar/*=2" would change the logging level for all code
-// in source files under a "foo/bar" directory.
-//
-// There's also VLOG_IS_ON(n) "verbose level" condition macro. To be used as
-//
-//   if (VLOG_IS_ON(2)) {
-//     // do some logging preparation and logging
-//     // that can't be accomplished with just VLOG(2) << ...;
-//   }
-//
-// There is also a VLOG_IF "verbose level" condition macro for sample
-// cases, when some extra computation and preparation for logs is not
-// needed.
-//
-//   VLOG_IF(1, (size > 1024))
-//      << "I'm printed when size is more than 1024 and when you run the "
-//         "program with --v=1 or more";
-//
-// We also override the standard 'assert' to use 'DLOG_ASSERT'.
-//
-// Lastly, there is:
-//
-//   PLOG(ERROR) << "Couldn't do foo";
-//   DPLOG(ERROR) << "Couldn't do foo";
-//   PLOG_IF(ERROR, cond) << "Couldn't do foo";
-//   DPLOG_IF(ERROR, cond) << "Couldn't do foo";
-//   PCHECK(condition) << "Couldn't do foo";
-//   DPCHECK(condition) << "Couldn't do foo";
-//
-// which append the last system error to the message in string form (taken from
-// GetLastError() on Windows and errno on POSIX).
-//
-// The supported severity levels for macros that allow you to specify one
-// are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL.
-//
-// Very important: logging a message at the FATAL severity level causes
-// the program to terminate (after the message is logged).
-//
-// There is the special severity of DFATAL, which logs FATAL in debug mode,
-// ERROR in normal mode.
-//
-
-#ifndef CEF_INCLUDE_BASE_CEF_LOGGING_H_
-#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)
-// 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
-// the Chromium header first to avoid type conflicts.
-
-// Always define the DCHECK_IS_ON macro which is used from other CEF headers.
-#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-#define DCHECK_IS_ON() false
-#else
-#define DCHECK_IS_ON() true
-#endif
-
-#else  // !defined(DCHECK)
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <cassert>
-#include <cstring>
-#include <sstream>
-#include <string>
-
-#include "include/base/cef_build.h"
-#include "include/internal/cef_logging_internal.h"
-
-namespace cef {
-namespace logging {
-
-// Gets the current log level.
-inline int GetMinLogLevel() {
-  return cef_get_min_log_level();
-}
-
-// Gets the current vlog level for the given file (usually taken from
-// __FILE__). Note that |N| is the size *with* the null terminator.
-template <size_t N>
-int GetVlogLevel(const char (&file)[N]) {
-  return cef_get_vlog_level(file, N);
-}
-
-typedef int LogSeverity;
-const LogSeverity LOG_VERBOSE = -1;  // This is level 1 verbosity
-// Note: the log severities are used to index into the array of names,
-// see log_severity_names.
-const LogSeverity LOG_INFO = 0;
-const LogSeverity LOG_WARNING = 1;
-const LogSeverity LOG_ERROR = 2;
-const LogSeverity LOG_FATAL = 3;
-const LogSeverity LOG_NUM_SEVERITIES = 4;
-
-// LOG_DFATAL is LOG_FATAL in debug mode, ERROR in normal mode
-#ifdef NDEBUG
-const LogSeverity LOG_DFATAL = LOG_ERROR;
-#else
-const LogSeverity LOG_DFATAL = LOG_FATAL;
-#endif
-
-// A few definitions of macros that don't generate much code. These are used
-// by LOG() and LOG_IF, etc. Since these are used all over our code, it's
-// better to have compact code for these operations.
-#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_INFO, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_WARNING, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_ERROR, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_FATAL, \
-                            ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                        \
-  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_DFATAL, \
-                            ##__VA_ARGS__)
-
-#define COMPACT_GOOGLE_LOG_INFO COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
-#define COMPACT_GOOGLE_LOG_WARNING COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
-#define COMPACT_GOOGLE_LOG_ERROR COMPACT_GOOGLE_LOG_EX_ERROR(LogMessage)
-#define COMPACT_GOOGLE_LOG_FATAL COMPACT_GOOGLE_LOG_EX_FATAL(LogMessage)
-#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage)
-
-#if defined(OS_WIN)
-// wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets
-// substituted with 0, and it expands to COMPACT_GOOGLE_LOG_0. To allow us
-// to keep using this syntax, we define this macro to do the same thing
-// as COMPACT_GOOGLE_LOG_ERROR, and also define ERROR the same way that
-// the Windows SDK does for consistency.
-#define ERROR 0
-#define COMPACT_GOOGLE_LOG_EX_0(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR
-// Needed for LOG_IS_ON(ERROR).
-const LogSeverity LOG_0 = LOG_ERROR;
-#endif
-
-// As special cases, we can assume that LOG_IS_ON(FATAL) always holds. Also,
-// LOG_IS_ON(DFATAL) always holds in debug mode. In particular, CHECK()s will
-// always fire if they fail.
-#define LOG_IS_ON(severity) \
-  ((::cef::logging::LOG_##severity) >= ::cef::logging::GetMinLogLevel())
-
-// We can't do any caching tricks with VLOG_IS_ON() like the
-// google-glog version since it requires GCC extensions.  This means
-// that using the v-logging functions in conjunction with --vmodule
-// may be slow.
-#define VLOG_IS_ON(verboselevel) \
-  ((verboselevel) <= ::cef::logging::GetVlogLevel(__FILE__))
-
-// Helper macro which avoids evaluating the arguments to a stream if
-// the condition doesn't hold.
-#define LAZY_STREAM(stream, condition) \
-  !(condition) ? (void)0 : ::cef::logging::LogMessageVoidify() & (stream)
-
-// We use the preprocessor's merging operator, "##", so that, e.g.,
-// LOG(INFO) becomes the token COMPACT_GOOGLE_LOG_INFO.  There's some funny
-// subtle difference between ostream member streaming functions (e.g.,
-// ostream::operator<<(int) and ostream non-member streaming functions
-// (e.g., ::operator<<(ostream&, string&): it turns out that it's
-// impossible to stream something like a string directly to an unnamed
-// ostream. We employ a neat hack by calling the stream() member
-// function of LogMessage which seems to avoid the problem.
-#define LOG_STREAM(severity) COMPACT_GOOGLE_LOG_##severity.stream()
-
-#define LOG(severity) LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity))
-#define LOG_IF(severity, condition) \
-  LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity) && (condition))
-
-#define SYSLOG(severity) LOG(severity)
-#define SYSLOG_IF(severity, condition) LOG_IF(severity, condition)
-
-// The VLOG macros log with negative verbosities.
-#define VLOG_STREAM(verbose_level) \
-  cef::logging::LogMessage(__FILE__, __LINE__, -verbose_level).stream()
-
-#define VLOG(verbose_level) \
-  LAZY_STREAM(VLOG_STREAM(verbose_level), VLOG_IS_ON(verbose_level))
-
-#define VLOG_IF(verbose_level, condition) \
-  LAZY_STREAM(VLOG_STREAM(verbose_level), \
-              VLOG_IS_ON(verbose_level) && (condition))
-
-#if defined(OS_WIN)
-#define VPLOG_STREAM(verbose_level)                                            \
-  cef::logging::Win32ErrorLogMessage(__FILE__, __LINE__, -verbose_level,       \
-                                     ::cef::logging::GetLastSystemErrorCode()) \
-      .stream()
-#elif defined(OS_POSIX)
-#define VPLOG_STREAM(verbose_level)                                       \
-  cef::logging::ErrnoLogMessage(__FILE__, __LINE__, -verbose_level,       \
-                                ::cef::logging::GetLastSystemErrorCode()) \
-      .stream()
-#endif
-
-#define VPLOG(verbose_level) \
-  LAZY_STREAM(VPLOG_STREAM(verbose_level), VLOG_IS_ON(verbose_level))
-
-#define VPLOG_IF(verbose_level, condition) \
-  LAZY_STREAM(VPLOG_STREAM(verbose_level), \
-              VLOG_IS_ON(verbose_level) && (condition))
-
-// TODO(akalin): Add more VLOG variants, e.g. VPLOG.
-
-#define LOG_ASSERT(condition) \
-  LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". "
-#define SYSLOG_ASSERT(condition) \
-  SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". "
-
-#if defined(OS_WIN)
-#define PLOG_STREAM(severity)                                                \
-  COMPACT_GOOGLE_LOG_EX_##severity(Win32ErrorLogMessage,                     \
-                                   ::cef::logging::GetLastSystemErrorCode()) \
-      .stream()
-#elif defined(OS_POSIX)
-#define PLOG_STREAM(severity)                                                \
-  COMPACT_GOOGLE_LOG_EX_##severity(ErrnoLogMessage,                          \
-                                   ::cef::logging::GetLastSystemErrorCode()) \
-      .stream()
-#endif
-
-#define PLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity))
-
-#define PLOG_IF(severity, condition) \
-  LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity) && (condition))
-
-// The actual stream used isn't important.
-#define EAT_STREAM_PARAMETERS \
-  true ? (void)0 : ::cef::logging::LogMessageVoidify() & LOG_STREAM(FATAL)
-
-// CHECK dies with a fatal error if condition is not true.  It is *not*
-// controlled by NDEBUG, so the check will be executed regardless of
-// compilation mode.
-//
-// We make sure CHECK et al. always evaluates their arguments, as
-// doing CHECK(FunctionWithSideEffect()) is a common idiom.
-
-#define CHECK(condition)                       \
-  LAZY_STREAM(LOG_STREAM(FATAL), !(condition)) \
-      << "Check failed: " #condition ". "
-
-#define PCHECK(condition)                       \
-  LAZY_STREAM(PLOG_STREAM(FATAL), !(condition)) \
-      << "Check failed: " #condition ". "
-
-// Helper macro for binary operators.
-// Don't use this macro directly in your code, use CHECK_EQ et al below.
-//
-// TODO(akalin): Rewrite this so that constructs like if (...)
-// CHECK_EQ(...) else { ... } work properly.
-#define CHECK_OP(name, op, val1, val2)                        \
-  if (std::string* _result = cef::logging::Check##name##Impl( \
-          (val1), (val2), #val1 " " #op " " #val2))           \
-  cef::logging::LogMessage(__FILE__, __LINE__, _result).stream()
-
-// Build the error message string.  This is separate from the "Impl"
-// function template because it is not performance critical and so can
-// be out of line, while the "Impl" code should be inline.  Caller
-// takes ownership of the returned string.
-template <class t1, class t2>
-std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
-  std::ostringstream ss;
-  ss << names << " (" << v1 << " vs. " << v2 << ")";
-  std::string* msg = new std::string(ss.str());
-  return msg;
-}
-
-// MSVC doesn't like complex extern templates and DLLs.
-#if !defined(COMPILER_MSVC)
-// Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated
-// in logging.cc.
-extern template std::string* MakeCheckOpString<int, int>(const int&,
-                                                         const int&,
-                                                         const char* names);
-extern template std::string* MakeCheckOpString<unsigned long, unsigned long>(
-    const unsigned long&,
-    const unsigned long&,
-    const char* names);
-extern template std::string* MakeCheckOpString<unsigned long, unsigned int>(
-    const unsigned long&,
-    const unsigned int&,
-    const char* names);
-extern template std::string* MakeCheckOpString<unsigned int, unsigned long>(
-    const unsigned int&,
-    const unsigned long&,
-    const char* names);
-extern template std::string* MakeCheckOpString<std::string, std::string>(
-    const std::string&,
-    const std::string&,
-    const char* name);
-#endif
-
-// Helper functions for CHECK_OP macro.
-// The (int, int) specialization works around the issue that the compiler
-// will not instantiate the template version of the function on values of
-// unnamed enum type - see comment below.
-#define DEFINE_CHECK_OP_IMPL(name, op)                                       \
-  template <class t1, class t2>                                              \
-  inline std::string* Check##name##Impl(const t1& v1, const t2& v2,          \
-                                        const char* names) {                 \
-    if (v1 op v2)                                                            \
-      return NULL;                                                           \
-    else                                                                     \
-      return MakeCheckOpString(v1, v2, names);                               \
-  }                                                                          \
-  inline std::string* Check##name##Impl(int v1, int v2, const char* names) { \
-    if (v1 op v2)                                                            \
-      return NULL;                                                           \
-    else                                                                     \
-      return MakeCheckOpString(v1, v2, names);                               \
-  }
-DEFINE_CHECK_OP_IMPL(EQ, ==)
-DEFINE_CHECK_OP_IMPL(NE, !=)
-DEFINE_CHECK_OP_IMPL(LE, <=)
-DEFINE_CHECK_OP_IMPL(LT, <)
-DEFINE_CHECK_OP_IMPL(GE, >=)
-DEFINE_CHECK_OP_IMPL(GT, >)
-#undef DEFINE_CHECK_OP_IMPL
-
-#define CHECK_EQ(val1, val2) CHECK_OP(EQ, ==, val1, val2)
-#define CHECK_NE(val1, val2) CHECK_OP(NE, !=, val1, val2)
-#define CHECK_LE(val1, val2) CHECK_OP(LE, <=, val1, val2)
-#define CHECK_LT(val1, val2) CHECK_OP(LT, <, val1, val2)
-#define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
-#define CHECK_GT(val1, val2) CHECK_OP(GT, >, val1, val2)
-
-#if defined(NDEBUG)
-#define ENABLE_DLOG 0
-#else
-#define ENABLE_DLOG 1
-#endif
-
-#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-#define DCHECK_IS_ON() 0
-#else
-#define DCHECK_IS_ON() 1
-#endif
-
-// Definitions for DLOG et al.
-
-#if ENABLE_DLOG
-
-#define DLOG_IS_ON(severity) LOG_IS_ON(severity)
-#define DLOG_IF(severity, condition) LOG_IF(severity, condition)
-#define DLOG_ASSERT(condition) LOG_ASSERT(condition)
-#define DPLOG_IF(severity, condition) PLOG_IF(severity, condition)
-#define DVLOG_IF(verboselevel, condition) VLOG_IF(verboselevel, condition)
-#define DVPLOG_IF(verboselevel, condition) VPLOG_IF(verboselevel, condition)
-
-#else  // ENABLE_DLOG
-
-// If ENABLE_DLOG is off, we want to avoid emitting any references to
-// |condition| (which may reference a variable defined only if NDEBUG
-// is not defined).  Contrast this with DCHECK et al., which has
-// different behavior.
-
-#define DLOG_IS_ON(severity) false
-#define DLOG_IF(severity, condition) EAT_STREAM_PARAMETERS
-#define DLOG_ASSERT(condition) EAT_STREAM_PARAMETERS
-#define DPLOG_IF(severity, condition) EAT_STREAM_PARAMETERS
-#define DVLOG_IF(verboselevel, condition) EAT_STREAM_PARAMETERS
-#define DVPLOG_IF(verboselevel, condition) EAT_STREAM_PARAMETERS
-
-#endif  // ENABLE_DLOG
-
-// DEBUG_MODE is for uses like
-//   if (DEBUG_MODE) foo.CheckThatFoo();
-// instead of
-//   #ifndef NDEBUG
-//     foo.CheckThatFoo();
-//   #endif
-//
-// We tie its state to ENABLE_DLOG.
-enum { DEBUG_MODE = ENABLE_DLOG };
-
-#undef ENABLE_DLOG
-
-#define DLOG(severity) LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity))
-
-#define DPLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity))
-
-#define DVLOG(verboselevel) DVLOG_IF(verboselevel, VLOG_IS_ON(verboselevel))
-
-#define DVPLOG(verboselevel) DVPLOG_IF(verboselevel, VLOG_IS_ON(verboselevel))
-
-// Definitions for DCHECK et al.
-
-#if DCHECK_IS_ON()
-
-#define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_FATAL
-const LogSeverity LOG_DCHECK = LOG_FATAL;
-
-#else  // DCHECK_IS_ON()
-
-// These are just dummy values.
-#define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_INFO
-const LogSeverity LOG_DCHECK = LOG_INFO;
-
-#endif  // DCHECK_IS_ON()
-
-// DCHECK et al. make sure to reference |condition| regardless of
-// whether DCHECKs are enabled; this is so that we don't get unused
-// variable warnings if the only use of a variable is in a DCHECK.
-// This behavior is different from DLOG_IF et al.
-
-#define DCHECK(condition)                                         \
-  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \
-      << "Check failed: " #condition ". "
-
-#define DPCHECK(condition)                                         \
-  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \
-      << "Check failed: " #condition ". "
-
-// Helper macro for binary operators.
-// Don't use this macro directly in your code, use DCHECK_EQ et al below.
-#define DCHECK_OP(name, op, val1, val2)                                    \
-  if (DCHECK_IS_ON())                                                      \
-    if (std::string* _result = cef::logging::Check##name##Impl(            \
-            (val1), (val2), #val1 " " #op " " #val2))                      \
-  cef::logging::LogMessage(__FILE__, __LINE__, ::cef::logging::LOG_DCHECK, \
-                           _result)                                        \
-      .stream()
-
-// Equality/Inequality checks - compare two values, and log a
-// LOG_DCHECK message including the two values when the result is not
-// as expected.  The values must have operator<<(ostream, ...)
-// defined.
-//
-// You may append to the error message like so:
-//   DCHECK_NE(1, 2) << ": The world must be ending!";
-//
-// We are very careful to ensure that each argument is evaluated exactly
-// once, and that anything which is legal to pass as a function argument is
-// legal here.  In particular, the arguments may be temporary expressions
-// which will end up being destroyed at the end of the apparent statement,
-// for example:
-//   DCHECK_EQ(string("abc")[1], 'b');
-//
-// WARNING: These may not compile correctly if one of the arguments is a pointer
-// and the other is NULL. To work around this, simply static_cast NULL to the
-// type of the desired pointer.
-
-#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
-#define DCHECK_NE(val1, val2) DCHECK_OP(NE, !=, val1, val2)
-#define DCHECK_LE(val1, val2) DCHECK_OP(LE, <=, val1, val2)
-#define DCHECK_LT(val1, val2) DCHECK_OP(LT, <, val1, val2)
-#define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
-#define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2)
-
-#define NOTREACHED() DCHECK(false)
-
-// Redefine the standard assert to use our nice log files
-#undef assert
-#define assert(x) DLOG_ASSERT(x)
-
-// This class more or less represents a particular log message.  You
-// create an instance of LogMessage and then stream stuff to it.
-// When you finish streaming to it, ~LogMessage is called and the
-// full message gets streamed to the appropriate destination.
-//
-// You shouldn't actually use LogMessage's constructor to log things,
-// though.  You should use the LOG() macro (and variants thereof)
-// above.
-class LogMessage {
- public:
-  // Used for LOG(severity).
-  LogMessage(const char* file, int line, LogSeverity severity);
-
-  // Used for CHECK_EQ(), etc. Takes ownership of the given string.
-  // Implied severity = LOG_FATAL.
-  LogMessage(const char* file, int line, std::string* result);
-
-  // Used for DCHECK_EQ(), etc. Takes ownership of the given string.
-  LogMessage(const char* file,
-             int line,
-             LogSeverity severity,
-             std::string* result);
-
-  LogMessage(const LogMessage&) = delete;
-  LogMessage& operator=(const LogMessage&) = delete;
-
-  ~LogMessage();
-
-  std::ostream& stream() { return stream_; }
-
- private:
-  LogSeverity severity_;
-  std::ostringstream stream_;
-
-  // The file and line information passed in to the constructor.
-  const char* file_;
-  const int line_;
-
-#if defined(OS_WIN)
-  // Stores the current value of GetLastError in the constructor and restores
-  // it in the destructor by calling SetLastError.
-  // This is useful since the LogMessage class uses a lot of Win32 calls
-  // that will lose the value of GLE and the code that called the log function
-  // will have lost the thread error value when the log call returns.
-  class SaveLastError {
-   public:
-    SaveLastError();
-    ~SaveLastError();
-
-    unsigned long get_error() const { return last_error_; }
-
-   protected:
-    unsigned long last_error_;
-  };
-
-  SaveLastError last_error_;
-#endif
-};
-
-// A non-macro interface to the log facility; (useful
-// when the logging level is not a compile-time constant).
-inline void LogAtLevel(int const log_level, std::string const& msg) {
-  LogMessage(__FILE__, __LINE__, log_level).stream() << msg;
-}
-
-// This class is used to explicitly ignore values in the conditional
-// logging macros.  This avoids compiler warnings like "value computed
-// is not used" and "statement has no effect".
-class LogMessageVoidify {
- public:
-  LogMessageVoidify() {}
-  // This has to be an operator with a precedence lower than << but
-  // higher than ?:
-  void operator&(std::ostream&) {}
-};
-
-#if defined(OS_WIN)
-typedef unsigned long SystemErrorCode;
-#elif defined(OS_POSIX)
-typedef int SystemErrorCode;
-#endif
-
-// Alias for ::GetLastError() on Windows and errno on POSIX. Avoids having to
-// pull in windows.h just for GetLastError() and DWORD.
-SystemErrorCode GetLastSystemErrorCode();
-std::string SystemErrorCodeToString(SystemErrorCode error_code);
-
-#if defined(OS_WIN)
-// Appends a formatted system message of the GetLastError() type.
-class Win32ErrorLogMessage {
- public:
-  Win32ErrorLogMessage(const char* file,
-                       int line,
-                       LogSeverity severity,
-                       SystemErrorCode err);
-
-  Win32ErrorLogMessage(const Win32ErrorLogMessage&) = delete;
-  Win32ErrorLogMessage& operator=(const Win32ErrorLogMessage&) = delete;
-
-  // Appends the error message before destructing the encapsulated class.
-  ~Win32ErrorLogMessage();
-
-  std::ostream& stream() { return log_message_.stream(); }
-
- private:
-  SystemErrorCode err_;
-  LogMessage log_message_;
-};
-#elif defined(OS_POSIX)
-// Appends a formatted system message of the errno type
-class ErrnoLogMessage {
- public:
-  ErrnoLogMessage(const char* file,
-                  int line,
-                  LogSeverity severity,
-                  SystemErrorCode err);
-
-  ErrnoLogMessage(const ErrnoLogMessage&) = delete;
-  ErrnoLogMessage& operator=(const ErrnoLogMessage&) = delete;
-
-  // Appends the error message before destructing the encapsulated class.
-  ~ErrnoLogMessage();
-
-  std::ostream& stream() { return log_message_.stream(); }
-
- private:
-  SystemErrorCode err_;
-  LogMessage log_message_;
-};
-#endif  // OS_WIN
-
-}  // namespace logging
-}  // namespace cef
-
-// These functions are provided as a convenience for logging, which is where we
-// use streams (it is against Google style to use streams in other places). It
-// is designed to allow you to emit non-ASCII Unicode strings to the log file,
-// which is normally ASCII. It is relatively slow, so try not to use it for
-// common cases. Non-ASCII characters will be converted to UTF-8 by these
-// operators.
-std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
-inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
-  return out << wstr.c_str();
-}
-
-// The NOTIMPLEMENTED() macro annotates codepaths which have
-// not been implemented yet.
-//
-// The implementation of this macro is controlled by NOTIMPLEMENTED_POLICY:
-//   0 -- Do nothing (stripped by compiler)
-//   1 -- Warn at compile time
-//   2 -- Fail at compile time
-//   3 -- Fail at runtime (DCHECK)
-//   4 -- [default] LOG(ERROR) at runtime
-//   5 -- LOG(ERROR) at runtime, only once per call-site
-
-#ifndef NOTIMPLEMENTED_POLICY
-#if defined(OS_ANDROID) && defined(OFFICIAL_BUILD)
-#define NOTIMPLEMENTED_POLICY 0
-#else
-// Select default policy: LOG(ERROR)
-#define NOTIMPLEMENTED_POLICY 4
-#endif
-#endif
-
-#if defined(COMPILER_GCC)
-// On Linux, with GCC, we can use __PRETTY_FUNCTION__ to get the demangled name
-// of the current function in the NOTIMPLEMENTED message.
-#define NOTIMPLEMENTED_MSG "Not implemented reached in " << __PRETTY_FUNCTION__
-#else
-#define NOTIMPLEMENTED_MSG "NOT IMPLEMENTED"
-#endif
-
-#if NOTIMPLEMENTED_POLICY == 0
-#define NOTIMPLEMENTED() EAT_STREAM_PARAMETERS
-#elif NOTIMPLEMENTED_POLICY == 1
-// TODO, figure out how to generate a warning
-#define NOTIMPLEMENTED() COMPILE_ASSERT(false, NOT_IMPLEMENTED)
-#elif NOTIMPLEMENTED_POLICY == 2
-#define NOTIMPLEMENTED() COMPILE_ASSERT(false, NOT_IMPLEMENTED)
-#elif NOTIMPLEMENTED_POLICY == 3
-#define NOTIMPLEMENTED() NOTREACHED()
-#elif NOTIMPLEMENTED_POLICY == 4
-#define NOTIMPLEMENTED() LOG(ERROR) << NOTIMPLEMENTED_MSG
-#elif NOTIMPLEMENTED_POLICY == 5
-#define NOTIMPLEMENTED()                               \
-  do {                                                 \
-    static bool logged_once = false;                   \
-    LOG_IF(ERROR, !logged_once) << NOTIMPLEMENTED_MSG; \
-    logged_once = true;                                \
-  } while (0);                                         \
-  EAT_STREAM_PARAMETERS
-#endif
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_LOGGING_H_

include/base/cef_macros.h

@@ -1,63 +0,0 @@
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_MACROS_H_
-#define CEF_INCLUDE_BASE_CEF_MACROS_H_
-#pragma once
-
-#if !defined(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.
-
-// ALL DISALLOW_xxx MACROS ARE DEPRECATED; DO NOT USE IN NEW CODE.
-// Use explicit deletions instead.  See the section on copyability/movability in
-// //styleguide/c++/c++-dos-and-donts.md for more information.
-
-// DEPRECATED: See above. Makes a class uncopyable.
-#define DISALLOW_COPY(TypeName) TypeName(const TypeName&) = delete
-
-// DEPRECATED: See above. Makes a class unassignable.
-#define DISALLOW_ASSIGN(TypeName) TypeName& operator=(const TypeName&) = delete
-
-// DEPRECATED: See above. Makes a class uncopyable and unassignable.
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  DISALLOW_COPY(TypeName);                 \
-  DISALLOW_ASSIGN(TypeName)
-
-// DEPRECATED: See above. Disallow all implicit constructors, namely the
-// default constructor, copy constructor and operator= functions.
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName() = delete;                           \
-  DISALLOW_COPY_AND_ASSIGN(TypeName)
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_MACROS_H_

include/base/cef_platform_thread.h

@@ -1,101 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-// WARNING: You should *NOT* be using this class directly.  PlatformThread is
-// the low-level platform-specific abstraction to the OS's threading interface.
-// You should instead be using a message-loop driven Thread, see thread.h.
-
-#ifndef CEF_INCLUDE_BASE_PLATFORM_THREAD_H_
-#define CEF_INCLUDE_BASE_PLATFORM_THREAD_H_
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/threading/platform_thread.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/internal/cef_thread_internal.h"
-
-namespace base {
-
-// Used for logging. Always an integer value.
-typedef cef_platform_thread_id_t PlatformThreadId;
-
-// Used for thread checking and debugging.
-// Meant to be as fast as possible.
-// These are produced by PlatformThread::CurrentRef(), and used to later
-// check if we are on the same thread or not by using ==. These are safe
-// to copy between threads, but can't be copied to another process as they
-// have no meaning there. Also, the internal identifier can be re-used
-// after a thread dies, so a PlatformThreadRef cannot be reliably used
-// to distinguish a new thread from an old, dead thread.
-class PlatformThreadRef {
- public:
-  typedef cef_platform_thread_handle_t RefType;
-
-  PlatformThreadRef() : id_(0) {}
-
-  explicit PlatformThreadRef(RefType id) : id_(id) {}
-
-  bool operator==(PlatformThreadRef other) const { return id_ == other.id_; }
-
-  bool is_null() const { return id_ == 0; }
-
- private:
-  RefType id_;
-};
-
-// A namespace for low-level thread functions.
-// Chromium uses a class with static methods but CEF uses an actual namespace
-// to avoid linker problems with the sandbox libaries on Windows.
-namespace PlatformThread {
-
-// Gets the current thread id, which may be useful for logging purposes.
-inline PlatformThreadId CurrentId() {
-  return cef_get_current_platform_thread_id();
-}
-
-// Gets the current thread reference, which can be used to check if
-// we're on the right thread quickly.
-inline PlatformThreadRef CurrentRef() {
-  return PlatformThreadRef(cef_get_current_platform_thread_handle());
-}
-
-}  // namespace PlatformThread
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_PLATFORM_THREAD_H_

include/base/cef_ptr_util.h

@@ -1,58 +0,0 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2015
-// 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.
-
-#ifndef INCLUDE_BASE_CEF_PTR_UTIL_H_
-#define INCLUDE_BASE_CEF_PTR_UTIL_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/ptr_util.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 <memory>
-#include <utility>
-
-namespace base {
-
-// Helper to transfer ownership of a raw pointer to a std::unique_ptr<T>.
-// Note that std::unique_ptr<T> has very different semantics from
-// std::unique_ptr<T[]>: do not use this helper for array allocations.
-template <typename T>
-std::unique_ptr<T> WrapUnique(T* ptr) {
-  return std::unique_ptr<T>(ptr);
-}
-
-}  // namespace base
-
-#endif  // INCLUDE_BASE_CEF_PTR_UTIL_H_

include/base/cef_ref_counted.h

@@ -1,496 +0,0 @@
-// 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.
-//
-
-#ifndef CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_
-#define CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/ref_counted.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 <stddef.h>
-
-#include <utility>
-
-#include "include/base/cef_atomic_ref_count.h"
-#include "include/base/cef_build.h"
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_scoped_refptr.h"
-#include "include/base/cef_template_util.h"
-#include "include/base/cef_thread_checker.h"
-
-namespace base {
-namespace cef_subtle {
-
-class RefCountedBase {
- public:
-  bool HasOneRef() const { return ref_count_ == 1; }
-  bool HasAtLeastOneRef() const { return ref_count_ >= 1; }
-
- protected:
-  explicit RefCountedBase(StartRefCountFromZeroTag) {
-#if DCHECK_IS_ON()
-    thread_checker_.DetachFromThread();
-#endif
-  }
-
-  explicit RefCountedBase(StartRefCountFromOneTag) : ref_count_(1) {
-#if DCHECK_IS_ON()
-    needs_adopt_ref_ = true;
-    thread_checker_.DetachFromThread();
-#endif
-  }
-
-  RefCountedBase(const RefCountedBase&) = delete;
-  RefCountedBase& operator=(const RefCountedBase&) = delete;
-
-  ~RefCountedBase() {
-#if DCHECK_IS_ON()
-    DCHECK(in_dtor_) << "RefCounted object deleted without calling Release()";
-#endif
-  }
-
-  void AddRef() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!needs_adopt_ref_)
-        << "This RefCounted object is created with non-zero reference count."
-        << " The first reference to such a object has to be made by AdoptRef or"
-        << " MakeRefCounted.";
-    if (ref_count_ >= 1) {
-      DCHECK(CalledOnValidThread());
-    }
-#endif
-
-    AddRefImpl();
-  }
-
-  // Returns true if the object should self-delete.
-  bool Release() const {
-    ReleaseImpl();
-
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    if (ref_count_ == 0)
-      in_dtor_ = true;
-
-    if (ref_count_ >= 1)
-      DCHECK(CalledOnValidThread());
-    if (ref_count_ == 1)
-      thread_checker_.DetachFromThread();
-#endif
-
-    return ref_count_ == 0;
-  }
-
-  // Returns true if it is safe to read or write the object, from a thread
-  // safety standpoint. Should be DCHECK'd from the methods of RefCounted
-  // classes if there is a danger of objects being shared across threads.
-  //
-  // This produces fewer false positives than adding a separate ThreadChecker
-  // into the subclass, because it automatically detaches from the thread when
-  // the reference count is 1 (and never fails if there is only one reference).
-  //
-  // This means unlike a separate ThreadChecker, it will permit a singly
-  // referenced object to be passed between threads (not holding a reference on
-  // the sending thread), but will trap if the sending thread holds onto a
-  // reference, or if the object is accessed from multiple threads
-  // simultaneously.
-  bool IsOnValidThread() const {
-#if DCHECK_IS_ON()
-    return ref_count_ <= 1 || CalledOnValidThread();
-#else
-    return true;
-#endif
-  }
-
- private:
-  template <typename U>
-  friend scoped_refptr<U> base::AdoptRef(U*);
-
-  void Adopted() const {
-#if DCHECK_IS_ON()
-    DCHECK(needs_adopt_ref_);
-    needs_adopt_ref_ = false;
-#endif
-  }
-
-#if defined(ARCH_CPU_64_BITS)
-  void AddRefImpl() const;
-  void ReleaseImpl() const;
-#else
-  void AddRefImpl() const { ++ref_count_; }
-  void ReleaseImpl() const { --ref_count_; }
-#endif
-
-#if DCHECK_IS_ON()
-  bool CalledOnValidThread() const;
-#endif
-
-  mutable uint32_t ref_count_ = 0;
-  static_assert(std::is_unsigned<decltype(ref_count_)>::value,
-                "ref_count_ must be an unsigned type.");
-
-#if DCHECK_IS_ON()
-  mutable bool needs_adopt_ref_ = false;
-  mutable bool in_dtor_ = false;
-  mutable ThreadChecker thread_checker_;
-#endif
-};
-
-class RefCountedThreadSafeBase {
- public:
-  bool HasOneRef() const;
-  bool HasAtLeastOneRef() const;
-
- protected:
-  explicit constexpr RefCountedThreadSafeBase(StartRefCountFromZeroTag) {}
-  explicit constexpr RefCountedThreadSafeBase(StartRefCountFromOneTag)
-      : ref_count_(1) {
-#if DCHECK_IS_ON()
-    needs_adopt_ref_ = true;
-#endif
-  }
-
-  RefCountedThreadSafeBase(const RefCountedThreadSafeBase&) = delete;
-  RefCountedThreadSafeBase& operator=(const RefCountedThreadSafeBase&) = delete;
-
-#if DCHECK_IS_ON()
-  ~RefCountedThreadSafeBase();
-#else
-  ~RefCountedThreadSafeBase() = default;
-#endif
-
-// Release and AddRef are suitable for inlining on X86 because they generate
-// very small code threads. On other platforms (ARM), it causes a size
-// regression and is probably not worth it.
-#if defined(ARCH_CPU_X86_FAMILY)
-  // Returns true if the object should self-delete.
-  bool Release() const { return ReleaseImpl(); }
-  void AddRef() const { AddRefImpl(); }
-  void AddRefWithCheck() const { AddRefWithCheckImpl(); }
-#else
-  // Returns true if the object should self-delete.
-  bool Release() const;
-  void AddRef() const;
-  void AddRefWithCheck() const;
-#endif
-
- private:
-  template <typename U>
-  friend scoped_refptr<U> base::AdoptRef(U*);
-
-  void Adopted() const {
-#if DCHECK_IS_ON()
-    DCHECK(needs_adopt_ref_);
-    needs_adopt_ref_ = false;
-#endif
-  }
-
-  ALWAYS_INLINE void AddRefImpl() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!needs_adopt_ref_)
-        << "This RefCounted object is created with non-zero reference count."
-        << " The first reference to such a object has to be made by AdoptRef or"
-        << " MakeRefCounted.";
-#endif
-    ref_count_.Increment();
-  }
-
-  ALWAYS_INLINE void AddRefWithCheckImpl() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!needs_adopt_ref_)
-        << "This RefCounted object is created with non-zero reference count."
-        << " The first reference to such a object has to be made by AdoptRef or"
-        << " MakeRefCounted.";
-#endif
-    CHECK(ref_count_.Increment() > 0);
-  }
-
-  ALWAYS_INLINE bool ReleaseImpl() const {
-#if DCHECK_IS_ON()
-    DCHECK(!in_dtor_);
-    DCHECK(!ref_count_.IsZero());
-#endif
-    if (!ref_count_.Decrement()) {
-#if DCHECK_IS_ON()
-      in_dtor_ = true;
-#endif
-      return true;
-    }
-    return false;
-  }
-
-  mutable AtomicRefCount ref_count_{0};
-#if DCHECK_IS_ON()
-  mutable bool needs_adopt_ref_ = false;
-  mutable bool in_dtor_ = false;
-#endif
-};
-
-// ScopedAllowCrossThreadRefCountAccess disables the check documented on
-// RefCounted below for rare pre-existing use cases where thread-safety was
-// guaranteed through other means (e.g. explicit sequencing of calls across
-// execution threads when bouncing between threads in order). New callers
-// should refrain from using this (callsites handling thread-safety through
-// locks should use RefCountedThreadSafe per the overhead of its atomics being
-// negligible compared to locks anyways and callsites doing explicit sequencing
-// should properly std::move() the ref to avoid hitting this check).
-// TODO(tzik): Cleanup existing use cases and remove
-// ScopedAllowCrossThreadRefCountAccess.
-class ScopedAllowCrossThreadRefCountAccess final {
- public:
-#if DCHECK_IS_ON()
-  ScopedAllowCrossThreadRefCountAccess();
-  ~ScopedAllowCrossThreadRefCountAccess();
-#else
-  ScopedAllowCrossThreadRefCountAccess() {}
-  ~ScopedAllowCrossThreadRefCountAccess() {}
-#endif
-};
-
-}  // namespace cef_subtle
-
-using ScopedAllowCrossThreadRefCountAccess =
-    cef_subtle::ScopedAllowCrossThreadRefCountAccess;
-
-//
-// A base class for reference counted classes.  Otherwise, known as a cheap
-// knock-off of WebKit's RefCounted<T> class.  To use this, just extend your
-// class from it like so:
-//
-//   class MyFoo : public base::RefCounted<MyFoo> {
-//    ...
-//    private:
-//     friend class base::RefCounted<MyFoo>;
-//     ~MyFoo();
-//   };
-//
-// Usage Notes:
-// 1. You should always make your destructor non-public, to avoid any code
-// deleting the object accidentally while there are references to it.
-// 2. You should always make the ref-counted base class a friend of your class,
-// so that it can access the destructor.
-//
-// The ref count manipulation to RefCounted is NOT thread safe and has DCHECKs
-// to trap unsafe cross thread usage. A subclass instance of RefCounted can be
-// passed to another execution thread only when its ref count is 1. If the ref
-// count is more than 1, the RefCounted class verifies the ref updates are made
-// on the same execution thread as the previous ones. The subclass can also
-// manually call IsOnValidThread to trap other non-thread-safe accesses; see
-// the documentation for that method.
-//
-//
-// The reference count starts from zero by default, and we intended to migrate
-// to start-from-one ref count. Put REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE() to
-// the ref counted class to opt-in.
-//
-// If an object has start-from-one ref count, the first scoped_refptr need to be
-// created by base::AdoptRef() or base::MakeRefCounted(). We can use
-// base::MakeRefCounted() to create create both type of ref counted object.
-//
-// The motivations to use start-from-one ref count are:
-//  - Start-from-one ref count doesn't need the ref count increment for the
-//    first reference.
-//  - It can detect an invalid object acquisition for a being-deleted object
-//    that has zero ref count. That tends to happen on custom deleter that
-//    delays the deletion.
-//    TODO(tzik): Implement invalid acquisition detection.
-//  - Behavior parity to Blink's WTF::RefCounted, whose count starts from one.
-//    And start-from-one ref count is a step to merge WTF::RefCounted into
-//    base::RefCounted.
-//
-#define REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE()                 \
-  static constexpr ::base::cef_subtle::StartRefCountFromOneTag \
-      kRefCountPreference = ::base::cef_subtle::kStartRefCountFromOneTag
-
-template <class T, typename Traits>
-class RefCounted;
-
-template <typename T>
-struct DefaultRefCountedTraits {
-  static void Destruct(const T* x) {
-    RefCounted<T, DefaultRefCountedTraits>::DeleteInternal(x);
-  }
-};
-
-template <class T, typename Traits = DefaultRefCountedTraits<T>>
-class RefCounted : public cef_subtle::RefCountedBase {
- public:
-  static constexpr cef_subtle::StartRefCountFromZeroTag kRefCountPreference =
-      cef_subtle::kStartRefCountFromZeroTag;
-
-  RefCounted() : cef_subtle::RefCountedBase(T::kRefCountPreference) {}
-
-  RefCounted(const RefCounted&) = delete;
-  RefCounted& operator=(const RefCounted&) = delete;
-
-  void AddRef() const { cef_subtle::RefCountedBase::AddRef(); }
-
-  void Release() const {
-    if (cef_subtle::RefCountedBase::Release()) {
-      // Prune the code paths which the static analyzer may take to simulate
-      // object destruction. Use-after-free errors aren't possible given the
-      // lifetime guarantees of the refcounting system.
-      ANALYZER_SKIP_THIS_PATH();
-
-      Traits::Destruct(static_cast<const T*>(this));
-    }
-  }
-
- protected:
-  ~RefCounted() = default;
-
- private:
-  friend struct DefaultRefCountedTraits<T>;
-  template <typename U>
-  static void DeleteInternal(const U* x) {
-    delete x;
-  }
-};
-
-// Forward declaration.
-template <class T, typename Traits>
-class RefCountedThreadSafe;
-
-// Default traits for RefCountedThreadSafe<T>.  Deletes the object when its ref
-// count reaches 0.  Overload to delete it on a different thread etc.
-template <typename T>
-struct DefaultRefCountedThreadSafeTraits {
-  static void Destruct(const T* x) {
-    // Delete through RefCountedThreadSafe to make child classes only need to be
-    // friend with RefCountedThreadSafe instead of this struct, which is an
-    // implementation detail.
-    RefCountedThreadSafe<T, DefaultRefCountedThreadSafeTraits>::DeleteInternal(
-        x);
-  }
-};
-
-//
-// A thread-safe variant of RefCounted<T>
-//
-//   class MyFoo : public base::RefCountedThreadSafe<MyFoo> {
-//    ...
-//   };
-//
-// If you're using the default trait, then you should add compile time
-// asserts that no one else is deleting your object.  i.e.
-//    private:
-//     friend class base::RefCountedThreadSafe<MyFoo>;
-//     ~MyFoo();
-//
-// We can use REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE() with RefCountedThreadSafe
-// too. See the comment above the RefCounted definition for details.
-template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T>>
-class RefCountedThreadSafe : public cef_subtle::RefCountedThreadSafeBase {
- public:
-  static constexpr cef_subtle::StartRefCountFromZeroTag kRefCountPreference =
-      cef_subtle::kStartRefCountFromZeroTag;
-
-  explicit RefCountedThreadSafe()
-      : cef_subtle::RefCountedThreadSafeBase(T::kRefCountPreference) {}
-
-  RefCountedThreadSafe(const RefCountedThreadSafe&) = delete;
-  RefCountedThreadSafe& operator=(const RefCountedThreadSafe&) = delete;
-
-  void AddRef() const { AddRefImpl(T::kRefCountPreference); }
-
-  void Release() const {
-    if (cef_subtle::RefCountedThreadSafeBase::Release()) {
-      ANALYZER_SKIP_THIS_PATH();
-      Traits::Destruct(static_cast<const T*>(this));
-    }
-  }
-
- protected:
-  ~RefCountedThreadSafe() = default;
-
- private:
-  friend struct DefaultRefCountedThreadSafeTraits<T>;
-  template <typename U>
-  static void DeleteInternal(const U* x) {
-    delete x;
-  }
-
-  void AddRefImpl(cef_subtle::StartRefCountFromZeroTag) const {
-    cef_subtle::RefCountedThreadSafeBase::AddRef();
-  }
-
-  void AddRefImpl(cef_subtle::StartRefCountFromOneTag) const {
-    cef_subtle::RefCountedThreadSafeBase::AddRefWithCheck();
-  }
-};
-
-//
-// A thread-safe wrapper for some piece of data so we can place other
-// things in scoped_refptrs<>.
-//
-template <typename T>
-class RefCountedData
-    : public base::RefCountedThreadSafe<base::RefCountedData<T>> {
- public:
-  RefCountedData() : data() {}
-  RefCountedData(const T& in_value) : data(in_value) {}
-  RefCountedData(T&& in_value) : data(std::move(in_value)) {}
-  template <typename... Args>
-  explicit RefCountedData(in_place_t, Args&&... args)
-      : data(std::forward<Args>(args)...) {}
-
-  T data;
-
- private:
-  friend class base::RefCountedThreadSafe<base::RefCountedData<T>>;
-  ~RefCountedData() = default;
-};
-
-template <typename T>
-bool operator==(const RefCountedData<T>& lhs, const RefCountedData<T>& rhs) {
-  return lhs.data == rhs.data;
-}
-
-template <typename T>
-bool operator!=(const RefCountedData<T>& lhs, const RefCountedData<T>& rhs) {
-  return !(lhs == rhs);
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_

include/base/cef_scoped_refptr.h

@@ -1,411 +0,0 @@
-// Copyright (c) 2017 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
-#define CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/scoped_refptr.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 <stddef.h>
-
-#include <iosfwd>
-#include <type_traits>
-#include <utility>
-
-#include "include/base/cef_compiler_specific.h"
-#include "include/base/cef_logging.h"
-
-template <class T>
-class scoped_refptr;
-
-namespace base {
-
-template <class, typename>
-class RefCounted;
-template <class, typename>
-class RefCountedThreadSafe;
-class SequencedTaskRunner;
-class WrappedPromise;
-
-template <typename T>
-scoped_refptr<T> AdoptRef(T* t);
-
-namespace internal {
-
-class BasePromise;
-
-}  // namespace internal
-
-namespace cef_subtle {
-
-enum AdoptRefTag { kAdoptRefTag };
-enum StartRefCountFromZeroTag { kStartRefCountFromZeroTag };
-enum StartRefCountFromOneTag { kStartRefCountFromOneTag };
-
-template <typename T, typename U, typename V>
-constexpr bool IsRefCountPreferenceOverridden(const T*,
-                                              const RefCounted<U, V>*) {
-  return !std::is_same<std::decay_t<decltype(T::kRefCountPreference)>,
-                       std::decay_t<decltype(U::kRefCountPreference)>>::value;
-}
-
-template <typename T, typename U, typename V>
-constexpr bool IsRefCountPreferenceOverridden(
-    const T*,
-    const RefCountedThreadSafe<U, V>*) {
-  return !std::is_same<std::decay_t<decltype(T::kRefCountPreference)>,
-                       std::decay_t<decltype(U::kRefCountPreference)>>::value;
-}
-
-constexpr bool IsRefCountPreferenceOverridden(...) {
-  return false;
-}
-
-}  // namespace cef_subtle
-
-// Creates a scoped_refptr from a raw pointer without incrementing the reference
-// count. Use this only for a newly created object whose reference count starts
-// from 1 instead of 0.
-template <typename T>
-scoped_refptr<T> AdoptRef(T* obj) {
-  using Tag = std::decay_t<decltype(T::kRefCountPreference)>;
-  static_assert(std::is_same<cef_subtle::StartRefCountFromOneTag, Tag>::value,
-                "Use AdoptRef only if the reference count starts from one.");
-
-  DCHECK(obj);
-  DCHECK(obj->HasOneRef());
-  obj->Adopted();
-  return scoped_refptr<T>(obj, cef_subtle::kAdoptRefTag);
-}
-
-namespace cef_subtle {
-
-template <typename T>
-scoped_refptr<T> AdoptRefIfNeeded(T* obj, StartRefCountFromZeroTag) {
-  return scoped_refptr<T>(obj);
-}
-
-template <typename T>
-scoped_refptr<T> AdoptRefIfNeeded(T* obj, StartRefCountFromOneTag) {
-  return AdoptRef(obj);
-}
-
-}  // namespace cef_subtle
-
-// Constructs an instance of T, which is a ref counted type, and wraps the
-// object into a scoped_refptr<T>.
-template <typename T, typename... Args>
-scoped_refptr<T> MakeRefCounted(Args&&... args) {
-  T* obj = new T(std::forward<Args>(args)...);
-  return cef_subtle::AdoptRefIfNeeded(obj, T::kRefCountPreference);
-}
-
-// Takes an instance of T, which is a ref counted type, and wraps the object
-// into a scoped_refptr<T>.
-template <typename T>
-scoped_refptr<T> WrapRefCounted(T* t) {
-  return scoped_refptr<T>(t);
-}
-
-}  // namespace base
-
-//
-// A smart pointer class for reference counted objects.  Use this class instead
-// of calling AddRef and Release manually on a reference counted object to
-// avoid common memory leaks caused by forgetting to Release an object
-// reference.  Sample usage:
-//
-//   class MyFoo : public RefCounted<MyFoo> {
-//    ...
-//    private:
-//     friend class RefCounted<MyFoo>;  // Allow destruction by RefCounted<>.
-//     ~MyFoo();                        // Destructor must be private/protected.
-//   };
-//
-//   void some_function() {
-//     scoped_refptr<MyFoo> foo = MakeRefCounted<MyFoo>();
-//     foo->Method(param);
-//     // |foo| is released when this function returns
-//   }
-//
-//   void some_other_function() {
-//     scoped_refptr<MyFoo> foo = MakeRefCounted<MyFoo>();
-//     ...
-//     foo.reset();  // explicitly releases |foo|
-//     ...
-//     if (foo)
-//       foo->Method(param);
-//   }
-//
-// The above examples show how scoped_refptr<T> acts like a pointer to T.
-// Given two scoped_refptr<T> classes, it is also possible to exchange
-// references between the two objects, like so:
-//
-//   {
-//     scoped_refptr<MyFoo> a = MakeRefCounted<MyFoo>();
-//     scoped_refptr<MyFoo> b;
-//
-//     b.swap(a);
-//     // now, |b| references the MyFoo object, and |a| references nullptr.
-//   }
-//
-// To make both |a| and |b| in the above example reference the same MyFoo
-// object, simply use the assignment operator:
-//
-//   {
-//     scoped_refptr<MyFoo> a = MakeRefCounted<MyFoo>();
-//     scoped_refptr<MyFoo> b;
-//
-//     b = a;
-//     // now, |a| and |b| each own a reference to the same MyFoo object.
-//   }
-//
-// Also see Chromium's ownership and calling conventions:
-// https://chromium.googlesource.com/chromium/src/+/lkgr/styleguide/c++/c++.md#object-ownership-and-calling-conventions
-// Specifically:
-//   If the function (at least sometimes) takes a ref on a refcounted object,
-//   declare the param as scoped_refptr<T>. The caller can decide whether it
-//   wishes to transfer ownership (by calling std::move(t) when passing t) or
-//   retain its ref (by simply passing t directly).
-//   In other words, use scoped_refptr like you would a std::unique_ptr except
-//   in the odd case where it's required to hold on to a ref while handing one
-//   to another component (if a component merely needs to use t on the stack
-//   without keeping a ref: pass t as a raw T*).
-template <class T>
-class TRIVIAL_ABI scoped_refptr {
- public:
-  typedef T element_type;
-
-  constexpr scoped_refptr() = default;
-
-  // Allow implicit construction from nullptr.
-  constexpr scoped_refptr(std::nullptr_t) {}
-
-  // Constructs from a raw pointer. Note that this constructor allows implicit
-  // conversion from T* to scoped_refptr<T> which is strongly discouraged. If
-  // you are creating a new ref-counted object please use
-  // base::MakeRefCounted<T>() or base::WrapRefCounted<T>(). Otherwise you
-  // should move or copy construct from an existing scoped_refptr<T> to the
-  // ref-counted object.
-  scoped_refptr(T* p) : ptr_(p) {
-    if (ptr_)
-      AddRef(ptr_);
-  }
-
-  // Copy constructor. This is required in addition to the copy conversion
-  // constructor below.
-  scoped_refptr(const scoped_refptr& r) : scoped_refptr(r.ptr_) {}
-
-  // Copy conversion constructor.
-  template <typename U,
-            typename = typename std::enable_if<
-                std::is_convertible<U*, T*>::value>::type>
-  scoped_refptr(const scoped_refptr<U>& r) : scoped_refptr(r.ptr_) {}
-
-  // Move constructor. This is required in addition to the move conversion
-  // constructor below.
-  scoped_refptr(scoped_refptr&& r) noexcept : ptr_(r.ptr_) { r.ptr_ = nullptr; }
-
-  // Move conversion constructor.
-  template <typename U,
-            typename = typename std::enable_if<
-                std::is_convertible<U*, T*>::value>::type>
-  scoped_refptr(scoped_refptr<U>&& r) noexcept : ptr_(r.ptr_) {
-    r.ptr_ = nullptr;
-  }
-
-  ~scoped_refptr() {
-    static_assert(!base::cef_subtle::IsRefCountPreferenceOverridden(
-                      static_cast<T*>(nullptr), static_cast<T*>(nullptr)),
-                  "It's unsafe to override the ref count preference."
-                  " Please remove REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE"
-                  " from subclasses.");
-    if (ptr_)
-      Release(ptr_);
-  }
-
-  T* get() const { return ptr_; }
-
-  T& operator*() const {
-    DCHECK(ptr_);
-    return *ptr_;
-  }
-
-  T* operator->() const {
-    DCHECK(ptr_);
-    return ptr_;
-  }
-
-  scoped_refptr& operator=(std::nullptr_t) {
-    reset();
-    return *this;
-  }
-
-  scoped_refptr& operator=(T* p) { return *this = scoped_refptr(p); }
-
-  // Unified assignment operator.
-  scoped_refptr& operator=(scoped_refptr r) noexcept {
-    swap(r);
-    return *this;
-  }
-
-  // Sets managed object to null and releases reference to the previous managed
-  // object, if it existed.
-  void reset() { scoped_refptr().swap(*this); }
-
-  // Returns the owned pointer (if any), releasing ownership to the caller. The
-  // caller is responsible for managing the lifetime of the reference.
-  T* release() WARN_UNUSED_RESULT;
-
-  void swap(scoped_refptr& r) noexcept { std::swap(ptr_, r.ptr_); }
-
-  explicit operator bool() const { return ptr_ != nullptr; }
-
-  template <typename U>
-  bool operator==(const scoped_refptr<U>& rhs) const {
-    return ptr_ == rhs.get();
-  }
-
-  template <typename U>
-  bool operator!=(const scoped_refptr<U>& rhs) const {
-    return !operator==(rhs);
-  }
-
-  template <typename U>
-  bool operator<(const scoped_refptr<U>& rhs) const {
-    return ptr_ < rhs.get();
-  }
-
- protected:
-  T* ptr_ = nullptr;
-
- private:
-  template <typename U>
-  friend scoped_refptr<U> base::AdoptRef(U*);
-  friend class ::base::SequencedTaskRunner;
-
-  // Friend access so these classes can use the constructor below as part of a
-  // binary size optimization.
-  friend class ::base::internal::BasePromise;
-  friend class ::base::WrappedPromise;
-
-  scoped_refptr(T* p, base::cef_subtle::AdoptRefTag) : ptr_(p) {}
-
-  // Friend required for move constructors that set r.ptr_ to null.
-  template <typename U>
-  friend class scoped_refptr;
-
-  // Non-inline helpers to allow:
-  //     class Opaque;
-  //     extern template class scoped_refptr<Opaque>;
-  // Otherwise the compiler will complain that Opaque is an incomplete type.
-  static void AddRef(T* ptr);
-  static void Release(T* ptr);
-};
-
-template <typename T>
-T* scoped_refptr<T>::release() {
-  T* ptr = ptr_;
-  ptr_ = nullptr;
-  return ptr;
-}
-
-// static
-template <typename T>
-void scoped_refptr<T>::AddRef(T* ptr) {
-  ptr->AddRef();
-}
-
-// static
-template <typename T>
-void scoped_refptr<T>::Release(T* ptr) {
-  ptr->Release();
-}
-
-template <typename T, typename U>
-bool operator==(const scoped_refptr<T>& lhs, const U* rhs) {
-  return lhs.get() == rhs;
-}
-
-template <typename T, typename U>
-bool operator==(const T* lhs, const scoped_refptr<U>& rhs) {
-  return lhs == rhs.get();
-}
-
-template <typename T>
-bool operator==(const scoped_refptr<T>& lhs, std::nullptr_t null) {
-  return !static_cast<bool>(lhs);
-}
-
-template <typename T>
-bool operator==(std::nullptr_t null, const scoped_refptr<T>& rhs) {
-  return !static_cast<bool>(rhs);
-}
-
-template <typename T, typename U>
-bool operator!=(const scoped_refptr<T>& lhs, const U* rhs) {
-  return !operator==(lhs, rhs);
-}
-
-template <typename T, typename U>
-bool operator!=(const T* lhs, const scoped_refptr<U>& rhs) {
-  return !operator==(lhs, rhs);
-}
-
-template <typename T>
-bool operator!=(const scoped_refptr<T>& lhs, std::nullptr_t null) {
-  return !operator==(lhs, null);
-}
-
-template <typename T>
-bool operator!=(std::nullptr_t null, const scoped_refptr<T>& rhs) {
-  return !operator==(null, rhs);
-}
-
-template <typename T>
-std::ostream& operator<<(std::ostream& out, const scoped_refptr<T>& p) {
-  return out << p.get();
-}
-
-template <typename T>
-void swap(scoped_refptr<T>& lhs, scoped_refptr<T>& rhs) noexcept {
-  lhs.swap(rhs);
-}
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_

include/base/cef_scoped_typeref_mac.h

@@ -1,180 +0,0 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2013
-// 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.
-
-// ScopedTypeRef<> is patterned after std::unique_ptr<>, but maintains ownership
-// of a reference to any type that is maintained by Retain and Release methods.
-//
-// The Traits structure must provide the Retain and Release methods for type T.
-// A default ScopedTypeRefTraits is used but not defined, and should be defined
-// for each type to use this interface. For example, an appropriate definition
-// of ScopedTypeRefTraits for CGLContextObj would be:
-//
-//   template<>
-//   struct ScopedTypeRefTraits<CGLContextObj> {
-//     static CGLContextObj InvalidValue() { return nullptr; }
-//     static CGLContextObj Retain(CGLContextObj object) {
-//       CGLContextRetain(object);
-//       return object;
-//     }
-//     static void Release(CGLContextObj object) { CGLContextRelease(object); }
-//   };
-//
-// For the many types that have pass-by-pointer create functions, the function
-// InitializeInto() is provided to allow direct initialization and assumption
-// of ownership of the object. For example, continuing to use the above
-// CGLContextObj specialization:
-//
-//   base::ScopedTypeRef<CGLContextObj> context;
-//   CGLCreateContext(pixel_format, share_group, context.InitializeInto());
-//
-// For initialization with an existing object, the caller may specify whether
-// the ScopedTypeRef<> being initialized is assuming the caller's existing
-// ownership of the object (and should not call Retain in initialization) or if
-// it should not assume this ownership and must create its own (by calling
-// Retain in initialization). This behavior is based on the |policy| parameter,
-// with |ASSUME| for the former and |RETAIN| for the latter. The default policy
-// is to |ASSUME|.
-
-#ifndef CEF_INCLUDE_BASE_CEF_SCOPED_TYPEREF_MAC_H_
-#define CEF_INCLUDE_BASE_CEF_SCOPED_TYPEREF_MAC_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/mac/scoped_typeref.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_compiler_specific.h"
-#include "include/base/cef_logging.h"
-#include "include/base/internal/cef_scoped_policy.h"
-
-namespace base {
-
-template<typename T>
-struct ScopedTypeRefTraits;
-
-template<typename T, typename Traits = ScopedTypeRefTraits<T>>
-class ScopedTypeRef {
- public:
-  using element_type = T;
-
-  explicit constexpr ScopedTypeRef(
-      element_type object = Traits::InvalidValue(),
-      base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
-      : object_(object) {
-    if (object_ && policy == base::scoped_policy::RETAIN)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that)
-      : object_(that.object_) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  // This allows passing an object to a function that takes its superclass.
-  template <typename R, typename RTraits>
-  explicit ScopedTypeRef(const ScopedTypeRef<R, RTraits>& that_as_subclass)
-      : object_(that_as_subclass.get()) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(ScopedTypeRef<T, Traits>&& that) : object_(that.object_) {
-    that.object_ = Traits::InvalidValue();
-  }
-
-  ~ScopedTypeRef() {
-    if (object_)
-      Traits::Release(object_);
-  }
-
-  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-    return *this;
-  }
-
-  // This is to be used only to take ownership of objects that are created
-  // by pass-by-pointer create functions. To enforce this, require that the
-  // object be reset to NULL before this may be used.
-  element_type* InitializeInto() WARN_UNUSED_RESULT {
-    DCHECK(!object_);
-    return &object_;
-  }
-
-  void reset(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-  }
-
-  void reset(element_type object = Traits::InvalidValue(),
-             base::scoped_policy::OwnershipPolicy policy =
-                 base::scoped_policy::ASSUME) {
-    if (object && policy == base::scoped_policy::RETAIN)
-      object = Traits::Retain(object);
-    if (object_)
-      Traits::Release(object_);
-    object_ = object;
-  }
-
-  bool operator==(const element_type& that) const { return object_ == that; }
-
-  bool operator!=(const element_type& that) const { return object_ != that; }
-
-  operator element_type() const { return object_; }
-
-  element_type get() const { return object_; }
-
-  void swap(ScopedTypeRef& that) {
-    element_type temp = that.object_;
-    that.object_ = object_;
-    object_ = temp;
-  }
-
-  // ScopedTypeRef<>::release() is like std::unique_ptr<>::release.  It is NOT
-  // a wrapper for Release().  To force a ScopedTypeRef<> object to call
-  // Release(), use ScopedTypeRef<>::reset().
-  element_type release() WARN_UNUSED_RESULT {
-    element_type temp = object_;
-    object_ = Traits::InvalidValue();
-    return temp;
-  }
-
- private:
-  element_type object_;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_SCOPED_TYPEREF_MAC_H_

include/base/cef_template_util.h

@@ -1,414 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
-#define CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/template_util.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 <stddef.h>
-#include <iosfwd>
-#include <iterator>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "include/base/cef_build.h"
-
-// Some versions of libstdc++ have partial support for type_traits, but misses
-// a smaller subset while removing some of the older non-standard stuff. Assume
-// that all versions below 5.0 fall in this category, along with one 5.0
-// experimental release. Test for this by consulting compiler major version,
-// the only reliable option available, so theoretically this could fail should
-// you attempt to mix an earlier version of libstdc++ with >= GCC5. But
-// that's unlikely to work out, especially as GCC5 changed ABI.
-#define CR_GLIBCXX_5_0_0 20150123
-#if (defined(__GNUC__) && __GNUC__ < 5) || \
-    (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0)
-#define CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX
-#endif
-
-// This hacks around using gcc with libc++ which has some incompatibilies.
-// - is_trivially_* doesn't work: https://llvm.org/bugs/show_bug.cgi?id=27538
-// TODO(danakj): Remove this when android builders are all using a newer version
-// of gcc, or the android ndk is updated to a newer libc++ that works with older
-// gcc versions.
-#if !defined(__clang__) && defined(_LIBCPP_VERSION)
-#define CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX
-#endif
-
-namespace base {
-
-template <class T> struct is_non_const_reference : std::false_type {};
-template <class T> struct is_non_const_reference<T&> : std::true_type {};
-template <class T> struct is_non_const_reference<const T&> : std::false_type {};
-
-namespace internal {
-
-// Implementation detail of base::void_t below.
-template <typename...>
-struct make_void {
-  using type = void;
-};
-
-}  // namespace internal
-
-// base::void_t is an implementation of std::void_t from C++17.
-//
-// We use |base::internal::make_void| as a helper struct to avoid a C++14
-// defect:
-//   http://en.cppreference.com/w/cpp/types/void_t
-//   http://open-std.org/JTC1/SC22/WG21/docs/cwg_defects.html#1558
-template <typename... Ts>
-using void_t = typename ::base::internal::make_void<Ts...>::type;
-
-namespace internal {
-
-// Uses expression SFINAE to detect whether using operator<< would work.
-template <typename T, typename = void>
-struct SupportsOstreamOperator : std::false_type {};
-template <typename T>
-struct SupportsOstreamOperator<T,
-                               decltype(void(std::declval<std::ostream&>()
-                                             << std::declval<T>()))>
-    : std::true_type {};
-
-template <typename T, typename = void>
-struct SupportsToString : std::false_type {};
-template <typename T>
-struct SupportsToString<T, decltype(void(std::declval<T>().ToString()))>
-    : std::true_type {};
-
-// Used to detect whether the given type is an iterator.  This is normally used
-// with std::enable_if to provide disambiguation for functions that take
-// templatzed iterators as input.
-template <typename T, typename = void>
-struct is_iterator : std::false_type {};
-
-template <typename T>
-struct is_iterator<T,
-                   void_t<typename std::iterator_traits<T>::iterator_category>>
-    : std::true_type {};
-
-// Helper to express preferences in an overload set. If more than one overload
-// are available for a given set of parameters the overload with the higher
-// priority will be chosen.
-template <size_t I>
-struct priority_tag : priority_tag<I - 1> {};
-
-template <>
-struct priority_tag<0> {};
-
-}  // namespace internal
-
-// is_trivially_copyable is especially hard to get right.
-// - Older versions of libstdc++ will fail to have it like they do for other
-//   type traits. This has become a subset of the second point, but used to be
-//   handled independently.
-// - An experimental release of gcc includes most of type_traits but misses
-//   is_trivially_copyable, so we still have to avoid using libstdc++ in this
-//   case, which is covered by CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX.
-// - When compiling libc++ from before r239653, with a gcc compiler, the
-//   std::is_trivially_copyable can fail. So we need to work around that by not
-//   using the one in libc++ in this case. This is covered by the
-//   CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX define, and is discussed in
-//   https://llvm.org/bugs/show_bug.cgi?id=27538#c1 where they point out that
-//   in libc++'s commit r239653 this is fixed by libc++ checking for gcc 5.1.
-// - In both of the above cases we are using the gcc compiler. When defining
-//   this ourselves on compiler intrinsics, the __is_trivially_copyable()
-//   intrinsic is not available on gcc before version 5.1 (see the discussion in
-//   https://llvm.org/bugs/show_bug.cgi?id=27538#c1 again), so we must check for
-//   that version.
-// - When __is_trivially_copyable() is not available because we are on gcc older
-//   than 5.1, we need to fall back to something, so we use __has_trivial_copy()
-//   instead based on what was done one-off in bit_cast() previously.
-
-// TODO(crbug.com/554293): Remove this when all platforms have this in the std
-// namespace and it works with gcc as needed.
-#if defined(CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX) || \
-    defined(CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX)
-template <typename T>
-struct is_trivially_copyable {
-// TODO(danakj): Remove this when android builders are all using a newer version
-// of gcc, or the android ndk is updated to a newer libc++ that does this for
-// us.
-#if _GNUC_VER >= 501
-  static constexpr bool value = __is_trivially_copyable(T);
-#else
-  static constexpr bool value =
-      __has_trivial_copy(T) && __has_trivial_destructor(T);
-#endif
-};
-#else
-template <class T>
-using is_trivially_copyable = std::is_trivially_copyable<T>;
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7
-// Workaround for g++7 and earlier family.
-// Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80654, without this
-// Optional<std::vector<T>> where T is non-copyable causes a compile error.
-// As we know it is not trivially copy constructible, explicitly declare so.
-template <typename T>
-struct is_trivially_copy_constructible
-    : std::is_trivially_copy_constructible<T> {};
-
-template <typename... T>
-struct is_trivially_copy_constructible<std::vector<T...>> : std::false_type {};
-#else
-// Otherwise use std::is_trivially_copy_constructible as is.
-template <typename T>
-using is_trivially_copy_constructible = std::is_trivially_copy_constructible<T>;
-#endif
-
-// base::in_place_t is an implementation of std::in_place_t from
-// C++17. A tag type used to request in-place construction in template vararg
-// constructors.
-
-// Specification:
-// https://en.cppreference.com/w/cpp/utility/in_place
-struct in_place_t {};
-constexpr in_place_t in_place = {};
-
-// base::in_place_type_t is an implementation of std::in_place_type_t from
-// C++17. A tag type used for in-place construction when the type to construct
-// needs to be specified, such as with base::unique_any, designed to be a
-// drop-in replacement.
-
-// Specification:
-// http://en.cppreference.com/w/cpp/utility/in_place
-template <typename T>
-struct in_place_type_t {};
-
-template <typename T>
-struct is_in_place_type_t {
-  static constexpr bool value = false;
-};
-
-template <typename... Ts>
-struct is_in_place_type_t<in_place_type_t<Ts...>> {
-  static constexpr bool value = true;
-};
-
-// C++14 implementation of C++17's std::bool_constant.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/integral_constant
-// Specification: https://wg21.link/meta.type.synop
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
-
-// C++14 implementation of C++17's std::conjunction.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/conjunction
-// Specification: https://wg21.link/meta.logical#1.itemdecl:1
-template <typename...>
-struct conjunction : std::true_type {};
-
-template <typename B1>
-struct conjunction<B1> : B1 {};
-
-template <typename B1, typename... Bn>
-struct conjunction<B1, Bn...>
-    : std::conditional_t<static_cast<bool>(B1::value), conjunction<Bn...>, B1> {
-};
-
-// C++14 implementation of C++17's std::disjunction.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/disjunction
-// Specification: https://wg21.link/meta.logical#itemdecl:2
-template <typename...>
-struct disjunction : std::false_type {};
-
-template <typename B1>
-struct disjunction<B1> : B1 {};
-
-template <typename B1, typename... Bn>
-struct disjunction<B1, Bn...>
-    : std::conditional_t<static_cast<bool>(B1::value), B1, disjunction<Bn...>> {
-};
-
-// C++14 implementation of C++17's std::negation.
-//
-// Reference: https://en.cppreference.com/w/cpp/types/negation
-// Specification: https://wg21.link/meta.logical#itemdecl:3
-template <typename B>
-struct negation : bool_constant<!static_cast<bool>(B::value)> {};
-
-// Implementation of C++17's invoke_result.
-//
-// This implementation adds references to `Functor` and `Args` to work around
-// some quirks of std::result_of. See the #Notes section of [1] for details.
-//
-// References:
-// [1] https://en.cppreference.com/w/cpp/types/result_of
-// [2] https://wg21.link/meta.trans.other#lib:invoke_result
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-template <typename Functor, typename... Args>
-using invoke_result = std::invoke_result<Functor, Args...>;
-#else
-template <typename Functor, typename... Args>
-using invoke_result = std::result_of<Functor && (Args && ...)>;
-#endif
-
-// Implementation of C++17's std::invoke_result_t.
-//
-// Reference: https://wg21.link/meta.type.synop#lib:invoke_result_t
-template <typename Functor, typename... Args>
-using invoke_result_t = typename invoke_result<Functor, Args...>::type;
-
-namespace internal {
-
-// Base case, `InvokeResult` does not have a nested type member. This means `F`
-// could not be invoked with `Args...` and thus is not invocable.
-template <typename InvokeResult, typename R, typename = void>
-struct IsInvocableImpl : std::false_type {};
-
-// Happy case, `InvokeResult` does have a nested type member. Now check whether
-// `InvokeResult::type` is convertible to `R`. Short circuit in case
-// `std::is_void<R>`.
-template <typename InvokeResult, typename R>
-struct IsInvocableImpl<InvokeResult, R, void_t<typename InvokeResult::type>>
-    : disjunction<std::is_void<R>,
-                  std::is_convertible<typename InvokeResult::type, R>> {};
-
-}  // namespace internal
-
-// Implementation of C++17's std::is_invocable_r.
-//
-// Returns whether `F` can be invoked with `Args...` and the result is
-// convertible to `R`.
-//
-// Reference: https://wg21.link/meta.rel#lib:is_invocable_r
-template <typename R, typename F, typename... Args>
-struct is_invocable_r
-    : internal::IsInvocableImpl<invoke_result<F, Args...>, R> {};
-
-// Implementation of C++17's std::is_invocable.
-//
-// Returns whether `F` can be invoked with `Args...`.
-//
-// Reference: https://wg21.link/meta.rel#lib:is_invocable
-template <typename F, typename... Args>
-struct is_invocable : is_invocable_r<void, F, Args...> {};
-
-namespace internal {
-
-// The indirection with std::is_enum<T> is required, because instantiating
-// std::underlying_type_t<T> when T is not an enum is UB prior to C++20.
-template <typename T, bool = std::is_enum<T>::value>
-struct IsScopedEnumImpl : std::false_type {};
-
-template <typename T>
-struct IsScopedEnumImpl<T, /*std::is_enum<T>::value=*/true>
-    : negation<std::is_convertible<T, std::underlying_type_t<T>>> {};
-
-}  // namespace internal
-
-// Implementation of C++23's std::is_scoped_enum
-//
-// Reference: https://en.cppreference.com/w/cpp/types/is_scoped_enum
-template <typename T>
-struct is_scoped_enum : internal::IsScopedEnumImpl<T> {};
-
-// Implementation of C++20's std::remove_cvref.
-//
-// References:
-// - https://en.cppreference.com/w/cpp/types/remove_cvref
-// - https://wg21.link/meta.trans.other#lib:remove_cvref
-template <typename T>
-struct remove_cvref {
-  using type = std::remove_cv_t<std::remove_reference_t<T>>;
-};
-
-// Implementation of C++20's std::remove_cvref_t.
-//
-// References:
-// - https://en.cppreference.com/w/cpp/types/remove_cvref
-// - https://wg21.link/meta.type.synop#lib:remove_cvref_t
-template <typename T>
-using remove_cvref_t = typename remove_cvref<T>::type;
-
-// Simplified implementation of C++20's std::iter_value_t.
-// As opposed to std::iter_value_t, this implementation does not restrict
-// the type of `Iter` and does not consider specializations of
-// `indirectly_readable_traits`.
-//
-// Reference: https://wg21.link/readable.traits#2
-template <typename Iter>
-using iter_value_t =
-    typename std::iterator_traits<remove_cvref_t<Iter>>::value_type;
-
-// Simplified implementation of C++20's std::iter_reference_t.
-// As opposed to std::iter_reference_t, this implementation does not restrict
-// the type of `Iter`.
-//
-// Reference: https://wg21.link/iterator.synopsis#:~:text=iter_reference_t
-template <typename Iter>
-using iter_reference_t = decltype(*std::declval<Iter&>());
-
-// Simplified implementation of C++20's std::indirect_result_t. As opposed to
-// std::indirect_result_t, this implementation does not restrict the type of
-// `Func` and `Iters`.
-//
-// Reference: https://wg21.link/iterator.synopsis#:~:text=indirect_result_t
-template <typename Func, typename... Iters>
-using indirect_result_t = invoke_result_t<Func, iter_reference_t<Iters>...>;
-
-// Simplified implementation of C++20's std::projected. As opposed to
-// std::projected, this implementation does not explicitly restrict the type of
-// `Iter` and `Proj`, but rather does so implicitly by requiring
-// `indirect_result_t<Proj, Iter>` is a valid type. This is required for SFINAE
-// friendliness.
-//
-// Reference: https://wg21.link/projected
-template <typename Iter,
-          typename Proj,
-          typename IndirectResultT = indirect_result_t<Proj, Iter>>
-struct projected {
-  using value_type = remove_cvref_t<IndirectResultT>;
-
-  IndirectResultT operator*() const;  // not defined
-};
-
-}  // namespace base
-
-#undef CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX
-#undef CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_

include/base/cef_thread_checker.h

@@ -1,116 +0,0 @@
-// 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.
-
-#ifndef CEF_INCLUDE_BASE_THREAD_CHECKER_H_
-#define CEF_INCLUDE_BASE_THREAD_CHECKER_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/threading/thread_checker.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_logging.h"
-#include "include/base/internal/cef_thread_checker_impl.h"
-
-// Apart from debug builds, we also enable the thread checker in
-// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
-// with this define will get the same level of thread checking as
-// debug bots.
-#if DCHECK_IS_ON()
-#define ENABLE_THREAD_CHECKER 1
-#else
-#define ENABLE_THREAD_CHECKER 0
-#endif
-
-namespace base {
-
-namespace cef_internal {
-
-// Do nothing implementation, for use in release mode.
-//
-// Note: You should almost always use the ThreadChecker class to get the
-// right version for your build configuration.
-class ThreadCheckerDoNothing {
- public:
-  bool CalledOnValidThread() const { return true; }
-
-  void DetachFromThread() {}
-};
-
-}  // namespace cef_internal
-
-// ThreadChecker is a helper class used to help verify that some methods of a
-// class are called from the same thread. It provides identical functionality to
-// base::NonThreadSafe, but it is meant to be held as a member variable, rather
-// than inherited from base::NonThreadSafe.
-//
-// While inheriting from base::NonThreadSafe may give a clear indication about
-// the thread-safety of a class, it may also lead to violations of the style
-// guide with regard to multiple inheritance. The choice between having a
-// ThreadChecker member and inheriting from base::NonThreadSafe should be based
-// on whether:
-//  - Derived classes need to know the thread they belong to, as opposed to
-//    having that functionality fully encapsulated in the base class.
-//  - Derived classes should be able to reassign the base class to another
-//    thread, via DetachFromThread.
-//
-// If neither of these are true, then having a ThreadChecker member and calling
-// CalledOnValidThread is the preferable solution.
-//
-// Example:
-// class MyClass {
-//  public:
-//   void Foo() {
-//     DCHECK(thread_checker_.CalledOnValidThread());
-//     ... (do stuff) ...
-//   }
-//
-//  private:
-//   ThreadChecker thread_checker_;
-// }
-//
-// In Release mode, CalledOnValidThread will always return true.
-#if ENABLE_THREAD_CHECKER
-class ThreadChecker : public cef_internal::ThreadCheckerImpl {};
-#else
-class ThreadChecker : public cef_internal::ThreadCheckerDoNothing {};
-#endif  // ENABLE_THREAD_CHECKER
-
-#undef ENABLE_THREAD_CHECKER
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_THREAD_CHECKER_H_

include/base/cef_trace_event.h

@@ -1,415 +0,0 @@
-// 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.
-
-///
-// Trace events are for tracking application performance and resource usage.
-// Macros are provided to track:
-//    Begin and end of function calls
-//    Counters
-//
-// Events are issued against categories. Whereas LOG's categories are statically
-// defined, TRACE categories are created implicitly with a string. For example:
-//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
-//
-// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
-//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
-//   doSomethingCostly()
-//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
-// Note: Our tools can't always determine the correct BEGIN/END pairs unless
-// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
-// need them to be in separate scopes.
-//
-// A common use case is to trace entire function scopes. This issues a trace
-// BEGIN and END automatically:
-//   void doSomethingCostly() {
-//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
-//     ...
-//   }
-//
-// Additional parameters can be associated with an event:
-//   void doSomethingCostly2(int howMuch) {
-//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
-//         "howMuch", howMuch);
-//     ...
-//   }
-//
-// The trace system will automatically add to this information the current
-// process id, thread id, and a timestamp in microseconds.
-//
-// To trace an asynchronous procedure such as an IPC send/receive, use
-// ASYNC_BEGIN and ASYNC_END:
-//   [single threaded sender code]
-//     static int send_count = 0;
-//     ++send_count;
-//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
-//     Send(new MyMessage(send_count));
-//   [receive code]
-//     void OnMyMessage(send_count) {
-//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
-//     }
-// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
-// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
-// Pointers can be used for the ID parameter, and they will be mangled
-// internally so that the same pointer on two different processes will not
-// match. For example:
-//   class MyTracedClass {
-//    public:
-//     MyTracedClass() {
-//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
-//     }
-//     ~MyTracedClass() {
-//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
-//     }
-//   }
-//
-// The trace event also supports counters, which is a way to track a quantity
-// as it varies over time. Counters are created with the following macro:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
-//
-// Counters are process-specific. The macro itself can be issued from any
-// thread, however.
-//
-// Sometimes, you want to track two counters at once. You can do this with two
-// counter macros:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
-// Or you can do it with a combined macro:
-//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
-//       "bytesPinned", g_myCounterValue[0],
-//       "bytesAllocated", g_myCounterValue[1]);
-// This indicates to the tracing UI that these counters should be displayed
-// in a single graph, as a summed area chart.
-//
-// Since counters are in a global namespace, you may want to disembiguate with a
-// unique ID, by using the TRACE_COUNTER_ID* variations.
-//
-// By default, trace collection is compiled in, but turned off at runtime.
-// Collecting trace data is the responsibility of the embedding application. In
-// CEF's case, calling BeginTracing will turn on tracing on all active
-// processes.
-//
-//
-// Memory scoping note:
-// Tracing copies the pointers, not the string content, of the strings passed
-// in for category, name, and arg_names.  Thus, the following code will cause
-// problems:
-//     char* str = strdup("impprtantName");
-//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
-//     free(str);                   // Trace system now has dangling pointer
-//
-// To avoid this issue with the |name| and |arg_name| parameters, use the
-// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime
-// overhead.
-// Notes: The category must always be in a long-lived char* (i.e. static const).
-//        The |arg_values|, when used, are always deep copied with the _COPY
-//        macros.
-//
-//
-// Thread Safety:
-// All macros are thread safe and can be used from any process.
-///
-
-#ifndef CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_
-#define CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/trace_event/trace_event.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/internal/cef_trace_event_internal.h"
-
-// Records a pair of begin and end events called "name" for the current
-// scope, with 0, 1 or 2 associated arguments. If the category is not
-// enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT0(category, name)                              \
-  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false); \
-  CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
-#define TRACE_EVENT1(category, name, arg1_name, arg1_val)                     \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, false); \
-  CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
-#define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name,        \
-                        arg2_val, false);                                      \
-  CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
-
-// Implementation detail: trace event macros create temporary variable names.
-// These macros give each temporary variable a unique name based on the line
-// number to prevent name collisions.
-#define CEF_INTERNAL_TRACE_EVENT_UID3(a, b) cef_trace_event_unique_##a##b
-#define CEF_INTERNAL_TRACE_EVENT_UID2(a, b) CEF_INTERNAL_TRACE_EVENT_UID3(a, b)
-#define CEF_INTERNAL_TRACE_EVENT_UID(name_prefix) \
-  CEF_INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
-
-// Implementation detail: internal macro to end end event when the scope ends.
-#define CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)            \
-  cef_trace_event::CefTraceEndOnScopeClose CEF_INTERNAL_TRACE_EVENT_UID( \
-      profileScope)(category, name)
-
-// Records a single event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_INSTANT0(category, name) \
-  cef_trace_event_instant(category, name, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0, false)
-#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, arg2_name, \
-                             arg2_val)                                       \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name,    \
-                          arg2_val, false)
-#define TRACE_EVENT_COPY_INSTANT0(category, name) \
-  cef_trace_event_instant(category, name, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val,    \
-                                  arg2_name, arg2_val)                    \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name, \
-                          arg2_val, true)
-
-// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_BEGIN0(category, name) \
-  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, false)
-#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, arg2_name, \
-                           arg2_val)                                       \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name,    \
-                        arg2_val, false)
-#define TRACE_EVENT_COPY_BEGIN0(category, name) \
-  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val,    \
-                                arg2_name, arg2_val)                    \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name, \
-                        arg2_val, true)
-
-// Records a single END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_END0(category, name) \
-  cef_trace_event_end(category, name, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0, false)
-#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, arg2_name, \
-                         arg2_val)                                       \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,    \
-                      arg2_val, false)
-#define TRACE_EVENT_COPY_END0(category, name) \
-  cef_trace_event_end(category, name, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, arg2_name, \
-                              arg2_val)                                       \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,         \
-                      arg2_val, true)
-
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_COUNTER1(category, name, value) \
-  cef_trace_counter(category, name, NULL, value, NULL, 0, false)
-#define TRACE_COPY_COUNTER1(category, name, value) \
-  cef_trace_counter(category, name, NULL, value, NULL, 0, true)
-
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_COUNTER2(category, name, value1_name, value1_val, value2_name, \
-                       value2_val)                                           \
-  cef_trace_counter(category, name, value1_name, value1_val, value2_name,    \
-                    value2_val, false)
-#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val,      \
-                            value2_name, value2_val)                      \
-  cef_trace_counter(category, name, value1_name, value1_val, value2_name, \
-                    value2_val, true)
-
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the
-//   bits will be xored with a hash of the process ID so that the same pointer
-//   on two different processes will not collide.
-#define TRACE_COUNTER_ID1(category, name, id, value) \
-  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0, false)
-#define TRACE_COPY_COUNTER_ID1(category, name, id, value) \
-  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0, true)
-
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the
-//   bits will be xored with a hash of the process ID so that the same pointer
-//   on two different processes will not collide.
-#define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
-                          value2_name, value2_val)                     \
-  cef_trace_counter_id(category, name, id, value1_name, value1_val,    \
-                       value2_name, value2_val, false)
-#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \
-                               value2_name, value2_val)                     \
-  cef_trace_counter_id(category, name, id, value1_name, value1_val,         \
-                       value2_name, value2_val, true)
-
-// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event.
-//   ASYNC events are considered to match if their category, name and id values
-//   all match. |id| must either be a pointer or an integer value up to 64
-//   bits. If it's a pointer, the bits will be xored with a hash of the process
-//   ID sothat the same pointer on two different processes will not collide.
-// An asynchronous operation can consist of multiple phases. The first phase is
-// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
-// ASYNC_STEP_BEGIN macros. When the operation completes, call ASYNC_END.
-// An async operation can span threads and processes, but all events in that
-// operation must use the same |name| and |id|. Each event can have its own
-// args.
-#define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
-  cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val)    \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL, \
-                              0, false)
-#define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
-                                 arg2_name, arg2_val)                     \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,    \
-                              arg2_name, arg2_val, false)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \
-  cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL,   \
-                              0, true)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
-                                      arg2_name, arg2_val)                     \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,         \
-                              arg2_name, arg2_val, true)
-
-// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
-// category is not enabled, then this does nothing. The |name| and |id| must
-// match the ASYNC_BEGIN event above. The |step| param identifies this step
-// within the async event. This should be called at the beginning of the next
-// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-// ASYNC_STEP_PAST events.
-#define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step) \
-  cef_trace_event_async_step_into(category, name, id, step, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
-                                     arg1_val)                            \
-  cef_trace_event_async_step_into(category, name, id, step, arg1_name,    \
-                                  arg1_val, false)
-#define TRACE_EVENT_COPY_ASYNC_STEP_INTO0(category, name, id, step) \
-  cef_trace_event_async_step_into(category, name, id, step, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
-                                          arg1_val)                            \
-  cef_trace_event_async_step_into(category, name, id, step, arg1_name,         \
-                                  arg1_val, true)
-
-// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
-// category is not enabled, then this does nothing. The |name| and |id| must
-// match the ASYNC_BEGIN event above. The |step| param identifies this step
-// within the async event. This should be called at the beginning of the next
-// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-// ASYNC_STEP_INTO events.
-#define TRACE_EVENT_ASYNC_STEP_PAST0(category, name, id, step) \
-  cef_trace_event_async_step_past(category, name, id, step, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
-                                     arg1_val)                            \
-  cef_trace_event_async_step_past(category, name, id, step, arg1_name,    \
-                                  arg1_val, false)
-#define TRACE_EVENT_COPY_ASYNC_STEP_PAST0(category, name, id, step) \
-  cef_trace_event_async_step_past(category, name, id, step, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
-                                          arg1_val)                            \
-  cef_trace_event_async_step_past(category, name, id, step, arg1_name,         \
-                                  arg1_val, true)
-
-// Records a single ASYNC_END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-#define TRACE_EVENT_ASYNC_END0(category, name, id) \
-  cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val)       \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0, \
-                            false)
-#define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
-                               arg2_name, arg2_val)                     \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val,    \
-                            arg2_name, arg2_val, false)
-#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \
-  cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val)  \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0, \
-                            true)
-#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
-                                    arg2_name, arg2_val)                     \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val,         \
-                            arg2_name, arg2_val, true)
-
-namespace cef_trace_event {
-
-// Used by TRACE_EVENTx macro. Do not use directly.
-class CefTraceEndOnScopeClose {
- public:
-  CefTraceEndOnScopeClose(const char* category, const char* name)
-      : category_(category), name_(name) {}
-  ~CefTraceEndOnScopeClose() {
-    cef_trace_event_end(category_, name_, NULL, 0, NULL, 0, false);
-  }
-
- private:
-  const char* category_;
-  const char* name_;
-};
-
-}  // cef_trace_event
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_

include/base/cef_tuple.h

@@ -1,149 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// 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.
-
-// Use std::tuple as tuple type. This file contains helper functions for
-// working with std::tuples.
-// The functions DispatchToMethod and DispatchToFunction take a function pointer
-// or instance and method pointer, and unpack a tuple into arguments to the
-// call.
-//
-// Example usage:
-//   // These two methods of creating a Tuple are identical.
-//   std::tuple<int, const char*> tuple_a(1, "wee");
-//   std::tuple<int, const char*> tuple_b = std::make_tuple(1, "wee");
-//
-//   void SomeFunc(int a, const char* b) { }
-//   DispatchToFunction(&SomeFunc, tuple_a);  // SomeFunc(1, "wee")
-//   DispatchToFunction(
-//       &SomeFunc, std::make_tuple(10, "foo"));    // SomeFunc(10, "foo")
-//
-//   struct { void SomeMeth(int a, int b, int c) { } } foo;
-//   DispatchToMethod(&foo, &Foo::SomeMeth, std::make_tuple(1, 2, 3));
-//   // foo->SomeMeth(1, 2, 3);
-
-#ifndef CEF_INCLUDE_BASE_CEF_TUPLE_H_
-#define CEF_INCLUDE_BASE_CEF_TUPLE_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/tuple.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 <stddef.h>
-#include <tuple>
-#include <utility>
-
-#include "include/base/cef_build.h"
-
-namespace base {
-
-// Dispatchers ----------------------------------------------------------------
-//
-// Helper functions that call the given method on an object, with the unpacked
-// tuple arguments.  Notice that they all have the same number of arguments,
-// so you need only write:
-//   DispatchToMethod(object, &Object::method, args);
-// This is very useful for templated dispatchers, since they don't need to know
-// what type |args| is.
-
-// Non-Static Dispatchers with no out params.
-
-template <typename ObjT, typename Method, typename Tuple, size_t... Ns>
-inline void DispatchToMethodImpl(const ObjT& obj,
-                                 Method method,
-                                 Tuple&& args,
-                                 std::index_sequence<Ns...>) {
-  (obj->*method)(std::get<Ns>(std::forward<Tuple>(args))...);
-}
-
-template <typename ObjT, typename Method, typename Tuple>
-inline void DispatchToMethod(const ObjT& obj,
-                             Method method,
-                             Tuple&& args) {
-  constexpr size_t size = std::tuple_size<std::decay_t<Tuple>>::value;
-  DispatchToMethodImpl(obj, method, std::forward<Tuple>(args),
-                       std::make_index_sequence<size>());
-}
-
-// Static Dispatchers with no out params.
-
-template <typename Function, typename Tuple, size_t... Ns>
-inline void DispatchToFunctionImpl(Function function,
-                                   Tuple&& args,
-                                   std::index_sequence<Ns...>) {
-  (*function)(std::get<Ns>(std::forward<Tuple>(args))...);
-}
-
-template <typename Function, typename Tuple>
-inline void DispatchToFunction(Function function, Tuple&& args) {
-  constexpr size_t size = std::tuple_size<std::decay_t<Tuple>>::value;
-  DispatchToFunctionImpl(function, std::forward<Tuple>(args),
-                         std::make_index_sequence<size>());
-}
-
-// Dispatchers with out parameters.
-
-template <typename ObjT,
-          typename Method,
-          typename InTuple,
-          typename OutTuple,
-          size_t... InNs,
-          size_t... OutNs>
-inline void DispatchToMethodImpl(const ObjT& obj,
-                                 Method method,
-                                 InTuple&& in,
-                                 OutTuple* out,
-                                 std::index_sequence<InNs...>,
-                                 std::index_sequence<OutNs...>) {
-  (obj->*method)(std::get<InNs>(std::forward<InTuple>(in))...,
-                 &std::get<OutNs>(*out)...);
-}
-
-template <typename ObjT, typename Method, typename InTuple, typename OutTuple>
-inline void DispatchToMethod(const ObjT& obj,
-                             Method method,
-                             InTuple&& in,
-                             OutTuple* out) {
-  constexpr size_t in_size = std::tuple_size<std::decay_t<InTuple>>::value;
-  constexpr size_t out_size = std::tuple_size<OutTuple>::value;
-  DispatchToMethodImpl(obj, method, std::forward<InTuple>(in), out,
-                       std::make_index_sequence<in_size>(),
-                       std::make_index_sequence<out_size>());
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_TUPLE_H_

include/base/cef_weak_ptr.h

@@ -1,438 +0,0 @@
-// 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.
-
-// Weak pointers are pointers to an object that do not affect its lifetime,
-// and which may be invalidated (i.e. reset to nullptr) by the object, or its
-// owner, at any time, most commonly when the object is about to be deleted.
-
-// Weak pointers are useful when an object needs to be accessed safely by one
-// or more objects other than its owner, and those callers can cope with the
-// object vanishing and e.g. tasks posted to it being silently dropped.
-// Reference-counting such an object would complicate the ownership graph and
-// make it harder to reason about the object's lifetime.
-
-// EXAMPLE:
-//
-//  class Controller {
-//   public:
-//    void SpawnWorker() { Worker::StartNew(weak_factory_.GetWeakPtr()); }
-//    void WorkComplete(const Result& result) { ... }
-//   private:
-//    // Member variables should appear before the WeakPtrFactory, to ensure
-//    // that any WeakPtrs to Controller are invalidated before its members
-//    // variable's destructors are executed, rendering them invalid.
-//    WeakPtrFactory<Controller> weak_factory_{this};
-//  };
-//
-//  class Worker {
-//   public:
-//    static void StartNew(WeakPtr<Controller> controller) {
-//      Worker* worker = new Worker(std::move(controller));
-//      // Kick off asynchronous processing...
-//    }
-//   private:
-//    Worker(WeakPtr<Controller> controller)
-//        : controller_(std::move(controller)) {}
-//    void DidCompleteAsynchronousProcessing(const Result& result) {
-//      if (controller_)
-//        controller_->WorkComplete(result);
-//    }
-//    WeakPtr<Controller> controller_;
-//  };
-//
-// With this implementation a caller may use SpawnWorker() to dispatch multiple
-// Workers and subsequently delete the Controller, without waiting for all
-// Workers to have completed.
-
-// ------------------------- IMPORTANT: Thread-safety -------------------------
-
-// Weak pointers may be passed safely between threads, but must always be
-// dereferenced and invalidated on the same ThreaddTaskRunner otherwise
-// checking the pointer would be racey.
-//
-// To ensure correct use, the first time a WeakPtr issued by a WeakPtrFactory
-// is dereferenced, the factory and its WeakPtrs become bound to the calling
-// thread or current ThreaddWorkerPool token, and cannot be dereferenced or
-// invalidated on any other task runner. Bound WeakPtrs can still be handed
-// off to other task runners, e.g. to use to post tasks back to object on the
-// bound thread.
-//
-// If all WeakPtr objects are destroyed or invalidated then the factory is
-// unbound from the ThreaddTaskRunner/Thread. The WeakPtrFactory may then be
-// destroyed, or new WeakPtr objects may be used, from a different thread.
-//
-// Thus, at least one WeakPtr object must exist and have been dereferenced on
-// the correct thread to enforce that other WeakPtr objects will enforce they
-// are used on the desired thread.
-
-#ifndef CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
-#define CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
-#pragma once
-
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/memory/weak_ptr.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 <cstddef>
-#include <type_traits>
-
-#include "include/base/cef_atomic_flag.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_ref_counted.h"
-#include "include/base/cef_thread_checker.h"
-
-namespace base {
-
-template <typename T>
-class SupportsWeakPtr;
-template <typename T>
-class WeakPtr;
-
-namespace internal {
-// These classes are part of the WeakPtr implementation.
-// DO NOT USE THESE CLASSES DIRECTLY YOURSELF.
-
-class WeakReference {
- public:
-  // Although Flag is bound to a specific ThreaddTaskRunner, it may be
-  // deleted from another via base::WeakPtr::~WeakPtr().
-  class Flag : public RefCountedThreadSafe<Flag> {
-   public:
-    Flag();
-
-    void Invalidate();
-    bool IsValid() const;
-
-    bool MaybeValid() const;
-
-    void DetachFromThread();
-
-   private:
-    friend class base::RefCountedThreadSafe<Flag>;
-
-    ~Flag();
-
-    base::ThreadChecker thread_checker_;
-    AtomicFlag invalidated_;
-  };
-
-  WeakReference();
-  explicit WeakReference(const scoped_refptr<Flag>& flag);
-  ~WeakReference();
-
-  WeakReference(WeakReference&& other) noexcept;
-  WeakReference(const WeakReference& other);
-  WeakReference& operator=(WeakReference&& other) noexcept = default;
-  WeakReference& operator=(const WeakReference& other) = default;
-
-  bool IsValid() const;
-  bool MaybeValid() const;
-
- private:
-  scoped_refptr<const Flag> flag_;
-};
-
-class WeakReferenceOwner {
- public:
-  WeakReferenceOwner();
-  ~WeakReferenceOwner();
-
-  WeakReference GetRef() const;
-
-  bool HasRefs() const { return !flag_->HasOneRef(); }
-
-  void Invalidate();
-
- private:
-  scoped_refptr<WeakReference::Flag> flag_;
-};
-
-// This class simplifies the implementation of WeakPtr's type conversion
-// constructor by avoiding the need for a public accessor for ref_.  A
-// WeakPtr<T> cannot access the private members of WeakPtr<U>, so this
-// base class gives us a way to access ref_ in a protected fashion.
-class WeakPtrBase {
- public:
-  WeakPtrBase();
-  ~WeakPtrBase();
-
-  WeakPtrBase(const WeakPtrBase& other) = default;
-  WeakPtrBase(WeakPtrBase&& other) noexcept = default;
-  WeakPtrBase& operator=(const WeakPtrBase& other) = default;
-  WeakPtrBase& operator=(WeakPtrBase&& other) noexcept = default;
-
-  void reset() {
-    ref_ = internal::WeakReference();
-    ptr_ = 0;
-  }
-
- protected:
-  WeakPtrBase(const WeakReference& ref, uintptr_t ptr);
-
-  WeakReference ref_;
-
-  // This pointer is only valid when ref_.is_valid() is true.  Otherwise, its
-  // value is undefined (as opposed to nullptr).
-  uintptr_t ptr_;
-};
-
-// This class provides a common implementation of common functions that would
-// otherwise get instantiated separately for each distinct instantiation of
-// SupportsWeakPtr<>.
-class SupportsWeakPtrBase {
- public:
-  // A safe static downcast of a WeakPtr<Base> to WeakPtr<Derived>. This
-  // conversion will only compile if there is exists a Base which inherits
-  // from SupportsWeakPtr<Base>. See base::AsWeakPtr() below for a helper
-  // function that makes calling this easier.
-  //
-  // Precondition: t != nullptr
-  template <typename Derived>
-  static WeakPtr<Derived> StaticAsWeakPtr(Derived* t) {
-    static_assert(
-        std::is_base_of<internal::SupportsWeakPtrBase, Derived>::value,
-        "AsWeakPtr argument must inherit from SupportsWeakPtr");
-    return AsWeakPtrImpl<Derived>(t);
-  }
-
- private:
-  // This template function uses type inference to find a Base of Derived
-  // which is an instance of SupportsWeakPtr<Base>. We can then safely
-  // static_cast the Base* to a Derived*.
-  template <typename Derived, typename Base>
-  static WeakPtr<Derived> AsWeakPtrImpl(SupportsWeakPtr<Base>* t) {
-    WeakPtr<Base> ptr = t->AsWeakPtr();
-    return WeakPtr<Derived>(
-        ptr.ref_, static_cast<Derived*>(reinterpret_cast<Base*>(ptr.ptr_)));
-  }
-};
-
-}  // namespace internal
-
-template <typename T>
-class WeakPtrFactory;
-
-// The WeakPtr class holds a weak reference to |T*|.
-//
-// This class is designed to be used like a normal pointer.  You should always
-// null-test an object of this class before using it or invoking a method that
-// may result in the underlying object being destroyed.
-//
-// EXAMPLE:
-//
-//   class Foo { ... };
-//   WeakPtr<Foo> foo;
-//   if (foo)
-//     foo->method();
-//
-template <typename T>
-class WeakPtr : public internal::WeakPtrBase {
- public:
-  WeakPtr() = default;
-  WeakPtr(std::nullptr_t) {}
-
-  // Allow conversion from U to T provided U "is a" T. Note that this
-  // is separate from the (implicit) copy and move constructors.
-  template <typename U>
-  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other) {
-    // Need to cast from U* to T* to do pointer adjustment in case of multiple
-    // inheritance. This also enforces the "U is a T" rule.
-    T* t = reinterpret_cast<U*>(other.ptr_);
-    ptr_ = reinterpret_cast<uintptr_t>(t);
-  }
-  template <typename U>
-  WeakPtr(WeakPtr<U>&& other) noexcept : WeakPtrBase(std::move(other)) {
-    // Need to cast from U* to T* to do pointer adjustment in case of multiple
-    // inheritance. This also enforces the "U is a T" rule.
-    T* t = reinterpret_cast<U*>(other.ptr_);
-    ptr_ = reinterpret_cast<uintptr_t>(t);
-  }
-
-  T* get() const {
-    return ref_.IsValid() ? reinterpret_cast<T*>(ptr_) : nullptr;
-  }
-
-  T& operator*() const {
-    CHECK(ref_.IsValid());
-    return *get();
-  }
-  T* operator->() const {
-    CHECK(ref_.IsValid());
-    return get();
-  }
-
-  // Allow conditionals to test validity, e.g. if (weak_ptr) {...};
-  explicit operator bool() const { return get() != nullptr; }
-
-  // Returns false if the WeakPtr is confirmed to be invalid. This call is safe
-  // to make from any thread, e.g. to optimize away unnecessary work, but
-  // operator bool() must always be called, on the correct thread, before
-  // actually using the pointer.
-  //
-  // Warning: as with any object, this call is only thread-safe if the WeakPtr
-  // instance isn't being re-assigned or reset() racily with this call.
-  bool MaybeValid() const { return ref_.MaybeValid(); }
-
-  // Returns whether the object |this| points to has been invalidated. This can
-  // be used to distinguish a WeakPtr to a destroyed object from one that has
-  // been explicitly set to null.
-  bool WasInvalidated() const { return ptr_ && !ref_.IsValid(); }
-
- private:
-  friend class internal::SupportsWeakPtrBase;
-  template <typename U>
-  friend class WeakPtr;
-  friend class SupportsWeakPtr<T>;
-  friend class WeakPtrFactory<T>;
-
-  WeakPtr(const internal::WeakReference& ref, T* ptr)
-      : WeakPtrBase(ref, reinterpret_cast<uintptr_t>(ptr)) {}
-};
-
-// Allow callers to compare WeakPtrs against nullptr to test validity.
-template <class T>
-bool operator!=(const WeakPtr<T>& weak_ptr, std::nullptr_t) {
-  return !(weak_ptr == nullptr);
-}
-template <class T>
-bool operator!=(std::nullptr_t, const WeakPtr<T>& weak_ptr) {
-  return weak_ptr != nullptr;
-}
-template <class T>
-bool operator==(const WeakPtr<T>& weak_ptr, std::nullptr_t) {
-  return weak_ptr.get() == nullptr;
-}
-template <class T>
-bool operator==(std::nullptr_t, const WeakPtr<T>& weak_ptr) {
-  return weak_ptr == nullptr;
-}
-
-namespace internal {
-class WeakPtrFactoryBase {
- protected:
-  WeakPtrFactoryBase(uintptr_t ptr);
-  ~WeakPtrFactoryBase();
-  internal::WeakReferenceOwner weak_reference_owner_;
-  uintptr_t ptr_;
-};
-}  // namespace internal
-
-// A class may be composed of a WeakPtrFactory and thereby
-// control how it exposes weak pointers to itself.  This is helpful if you only
-// need weak pointers within the implementation of a class.  This class is also
-// useful when working with primitive types.  For example, you could have a
-// WeakPtrFactory<bool> that is used to pass around a weak reference to a bool.
-template <class T>
-class WeakPtrFactory : public internal::WeakPtrFactoryBase {
- public:
-  WeakPtrFactory() = delete;
-
-  explicit WeakPtrFactory(T* ptr)
-      : WeakPtrFactoryBase(reinterpret_cast<uintptr_t>(ptr)) {}
-
-  WeakPtrFactory(const WeakPtrFactory&) = delete;
-  WeakPtrFactory& operator=(const WeakPtrFactory&) = delete;
-
-  ~WeakPtrFactory() = default;
-
-  WeakPtr<T> GetWeakPtr() const {
-    return WeakPtr<T>(weak_reference_owner_.GetRef(),
-                      reinterpret_cast<T*>(ptr_));
-  }
-
-  // Call this method to invalidate all existing weak pointers.
-  void InvalidateWeakPtrs() {
-    DCHECK(ptr_);
-    weak_reference_owner_.Invalidate();
-  }
-
-  // Call this method to determine if any weak pointers exist.
-  bool HasWeakPtrs() const {
-    DCHECK(ptr_);
-    return weak_reference_owner_.HasRefs();
-  }
-};
-
-// A class may extend from SupportsWeakPtr to let others take weak pointers to
-// it. This avoids the class itself implementing boilerplate to dispense weak
-// pointers.  However, since SupportsWeakPtr's destructor won't invalidate
-// weak pointers to the class until after the derived class' members have been
-// destroyed, its use can lead to subtle use-after-destroy issues.
-template <class T>
-class SupportsWeakPtr : public internal::SupportsWeakPtrBase {
- public:
-  SupportsWeakPtr() = default;
-
-  SupportsWeakPtr(const SupportsWeakPtr&) = delete;
-  SupportsWeakPtr& operator=(const SupportsWeakPtr&) = delete;
-
-  WeakPtr<T> AsWeakPtr() {
-    return WeakPtr<T>(weak_reference_owner_.GetRef(), static_cast<T*>(this));
-  }
-
- protected:
-  ~SupportsWeakPtr() = default;
-
- private:
-  internal::WeakReferenceOwner weak_reference_owner_;
-};
-
-// Helper function that uses type deduction to safely return a WeakPtr<Derived>
-// when Derived doesn't directly extend SupportsWeakPtr<Derived>, instead it
-// extends a Base that extends SupportsWeakPtr<Base>.
-//
-// EXAMPLE:
-//   class Base : public base::SupportsWeakPtr<Producer> {};
-//   class Derived : public Base {};
-//
-//   Derived derived;
-//   base::WeakPtr<Derived> ptr = base::AsWeakPtr(&derived);
-//
-// Note that the following doesn't work (invalid type conversion) since
-// Derived::AsWeakPtr() is WeakPtr<Base> SupportsWeakPtr<Base>::AsWeakPtr(),
-// and there's no way to safely cast WeakPtr<Base> to WeakPtr<Derived> at
-// the caller.
-//
-//   base::WeakPtr<Derived> ptr = derived.AsWeakPtr();  // Fails.
-
-template <typename Derived>
-WeakPtr<Derived> AsWeakPtr(Derived* t) {
-  return internal::SupportsWeakPtrBase::StaticAsWeakPtr<Derived>(t);
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_

include/base/internal/cef_callback_internal.h

@@ -1,275 +0,0 @@
-// 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.
-
-// Do not include this header file directly. Use base/cef_bind.h or
-// base/cef_callback.h instead.
-
-// This file contains utility functions and classes that help the
-// implementation, and management of the Callback objects.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_
-
-#include "include/base/cef_callback_forward.h"
-#include "include/base/cef_ref_counted.h"
-
-namespace base {
-
-struct FakeBindState;
-
-namespace internal {
-
-class BindStateBase;
-class FinallyExecutorCommon;
-class ThenAndCatchExecutorCommon;
-
-template <typename ReturnType>
-class PostTaskExecutor;
-
-template <typename Functor, typename... BoundArgs>
-struct BindState;
-
-class CallbackBase;
-class CallbackBaseCopyable;
-
-struct BindStateBaseRefCountTraits {
-  static void Destruct(const BindStateBase*);
-};
-
-template <typename T>
-using PassingType = std::conditional_t<std::is_scalar<T>::value, T, T&&>;
-
-// BindStateBase is used to provide an opaque handle that the Callback
-// class can use to represent a function object with bound arguments.  It
-// behaves as an existential type that is used by a corresponding
-// DoInvoke function to perform the function execution.  This allows
-// us to shield the Callback class from the types of the bound argument via
-// "type erasure."
-// At the base level, the only task is to add reference counting data. Avoid
-// using or inheriting any virtual functions. Creating a vtable for every
-// BindState template instantiation results in a lot of bloat. Its only task is
-// to call the destructor which can be done with a function pointer.
-class BindStateBase
-    : public RefCountedThreadSafe<BindStateBase, BindStateBaseRefCountTraits> {
- public:
-  REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE();
-
-  enum CancellationQueryMode {
-    IS_CANCELLED,
-    MAYBE_VALID,
-  };
-
-  using InvokeFuncStorage = void (*)();
-
-  BindStateBase(const BindStateBase&) = delete;
-  BindStateBase& operator=(const BindStateBase&) = delete;
-
- private:
-  BindStateBase(InvokeFuncStorage polymorphic_invoke,
-                void (*destructor)(const BindStateBase*));
-  BindStateBase(InvokeFuncStorage polymorphic_invoke,
-                void (*destructor)(const BindStateBase*),
-                bool (*query_cancellation_traits)(const BindStateBase*,
-                                                  CancellationQueryMode mode));
-
-  ~BindStateBase() = default;
-
-  friend struct BindStateBaseRefCountTraits;
-  friend class RefCountedThreadSafe<BindStateBase, BindStateBaseRefCountTraits>;
-
-  friend class CallbackBase;
-  friend class CallbackBaseCopyable;
-
-  // Allowlist subclasses that access the destructor of BindStateBase.
-  template <typename Functor, typename... BoundArgs>
-  friend struct BindState;
-  friend struct ::base::FakeBindState;
-
-  bool IsCancelled() const {
-    return query_cancellation_traits_(this, IS_CANCELLED);
-  }
-
-  bool MaybeValid() const {
-    return query_cancellation_traits_(this, MAYBE_VALID);
-  }
-
-  // In C++, it is safe to cast function pointers to function pointers of
-  // another type. It is not okay to use void*. We create a InvokeFuncStorage
-  // that that can store our function pointer, and then cast it back to
-  // the original type on usage.
-  InvokeFuncStorage polymorphic_invoke_;
-
-  // Pointer to a function that will properly destroy |this|.
-  void (*destructor_)(const BindStateBase*);
-  bool (*query_cancellation_traits_)(const BindStateBase*,
-                                     CancellationQueryMode mode);
-};
-
-// Holds the Callback methods that don't require specialization to reduce
-// template bloat.
-// CallbackBase<MoveOnly> is a direct base class of MoveOnly callbacks, and
-// CallbackBase<Copyable> uses CallbackBase<MoveOnly> for its implementation.
-class CallbackBase {
- public:
-  inline CallbackBase(CallbackBase&& c) noexcept;
-  CallbackBase& operator=(CallbackBase&& c) noexcept;
-
-  explicit CallbackBase(const CallbackBaseCopyable& c);
-  CallbackBase& operator=(const CallbackBaseCopyable& c);
-
-  explicit CallbackBase(CallbackBaseCopyable&& c) noexcept;
-  CallbackBase& operator=(CallbackBaseCopyable&& c) noexcept;
-
-  // Returns true if Callback is null (doesn't refer to anything).
-  bool is_null() const { return !bind_state_; }
-  explicit operator bool() const { return !is_null(); }
-
-  // Returns true if the callback invocation will be nop due to an cancellation.
-  // It's invalid to call this on uninitialized callback.
-  //
-  // Must be called on the Callback's destination sequence.
-  bool IsCancelled() const;
-
-  // If this returns false, the callback invocation will be a nop due to a
-  // cancellation. This may(!) still return true, even on a cancelled callback.
-  //
-  // This function is thread-safe.
-  bool MaybeValid() const;
-
-  // Returns the Callback into an uninitialized state.
-  void Reset();
-
- protected:
-  friend class FinallyExecutorCommon;
-  friend class ThenAndCatchExecutorCommon;
-
-  template <typename ReturnType>
-  friend class PostTaskExecutor;
-
-  using InvokeFuncStorage = BindStateBase::InvokeFuncStorage;
-
-  // Returns true if this callback equals |other|. |other| may be null.
-  bool EqualsInternal(const CallbackBase& other) const;
-
-  constexpr inline CallbackBase();
-
-  // Allow initializing of |bind_state_| via the constructor to avoid default
-  // initialization of the scoped_refptr.
-  explicit inline CallbackBase(BindStateBase* bind_state);
-
-  InvokeFuncStorage polymorphic_invoke() const {
-    return bind_state_->polymorphic_invoke_;
-  }
-
-  // Force the destructor to be instantiated inside this translation unit so
-  // that our subclasses will not get inlined versions.  Avoids more template
-  // bloat.
-  ~CallbackBase();
-
-  scoped_refptr<BindStateBase> bind_state_;
-};
-
-constexpr CallbackBase::CallbackBase() = default;
-CallbackBase::CallbackBase(CallbackBase&&) noexcept = default;
-CallbackBase::CallbackBase(BindStateBase* bind_state)
-    : bind_state_(AdoptRef(bind_state)) {}
-
-// CallbackBase<Copyable> is a direct base class of Copyable Callbacks.
-class CallbackBaseCopyable : public CallbackBase {
- public:
-  CallbackBaseCopyable(const CallbackBaseCopyable& c);
-  CallbackBaseCopyable(CallbackBaseCopyable&& c) noexcept = default;
-  CallbackBaseCopyable& operator=(const CallbackBaseCopyable& c);
-  CallbackBaseCopyable& operator=(CallbackBaseCopyable&& c) noexcept;
-
- protected:
-  constexpr CallbackBaseCopyable() = default;
-  explicit CallbackBaseCopyable(BindStateBase* bind_state)
-      : CallbackBase(bind_state) {}
-  ~CallbackBaseCopyable() = default;
-};
-
-// Helpers for the `Then()` implementation.
-template <typename OriginalCallback, typename ThenCallback>
-struct ThenHelper;
-
-// Specialization when original callback returns `void`.
-template <template <typename> class OriginalCallback,
-          template <typename>
-          class ThenCallback,
-          typename... OriginalArgs,
-          typename ThenR,
-          typename... ThenArgs>
-struct ThenHelper<OriginalCallback<void(OriginalArgs...)>,
-                  ThenCallback<ThenR(ThenArgs...)>> {
-  static_assert(sizeof...(ThenArgs) == 0,
-                "|then| callback cannot accept parameters if |this| has a "
-                "void return type.");
-
-  static auto CreateTrampoline() {
-    return [](OriginalCallback<void(OriginalArgs...)> c1,
-              ThenCallback<ThenR(ThenArgs...)> c2, OriginalArgs... c1_args) {
-      std::move(c1).Run(std::forward<OriginalArgs>(c1_args)...);
-      return std::move(c2).Run();
-    };
-  }
-};
-
-// Specialization when original callback returns a non-void type.
-template <template <typename> class OriginalCallback,
-          template <typename>
-          class ThenCallback,
-          typename OriginalR,
-          typename... OriginalArgs,
-          typename ThenR,
-          typename... ThenArgs>
-struct ThenHelper<OriginalCallback<OriginalR(OriginalArgs...)>,
-                  ThenCallback<ThenR(ThenArgs...)>> {
-  static_assert(sizeof...(ThenArgs) == 1,
-                "|then| callback must accept exactly one parameter if |this| "
-                "has a non-void return type.");
-  // TODO(dcheng): This should probably check is_convertible as well (same with
-  // `AssertBindArgsValidity`).
-  static_assert(std::is_constructible<ThenArgs..., OriginalR&&>::value,
-                "|then| callback's parameter must be constructible from "
-                "return type of |this|.");
-
-  static auto CreateTrampoline() {
-    return [](OriginalCallback<OriginalR(OriginalArgs...)> c1,
-              ThenCallback<ThenR(ThenArgs...)> c2, OriginalArgs... c1_args) {
-      return std::move(c2).Run(
-          std::move(c1).Run(std::forward<OriginalArgs>(c1_args)...));
-    };
-  }
-};
-
-}  // namespace internal
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_

include/base/internal/cef_lock_impl.h

@@ -1,87 +0,0 @@
-// Copyright (c) 2011 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.
-
-// Do not include this header file directly. Use base/cef_lock.h instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_LOCK_IMPL_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_LOCK_IMPL_H_
-
-#include "include/base/cef_build.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#elif defined(OS_POSIX)
-#include <pthread.h>
-#endif
-
-namespace base {
-namespace cef_internal {
-
-// This class implements the underlying platform-specific spin-lock mechanism
-// used for the Lock class.  Most users should not use LockImpl directly, but
-// should instead use Lock.
-class LockImpl {
- public:
-#if defined(OS_WIN)
-  typedef CRITICAL_SECTION NativeHandle;
-#elif defined(OS_POSIX)
-  typedef pthread_mutex_t NativeHandle;
-#endif
-
-  LockImpl();
-
-  LockImpl(const LockImpl&) = delete;
-  LockImpl& operator=(const LockImpl&) = delete;
-
-  ~LockImpl();
-
-  // If the lock is not held, take it and return true.  If the lock is already
-  // held by something else, immediately return false.
-  bool Try();
-
-  // Take the lock, blocking until it is available if necessary.
-  void Lock();
-
-  // Release the lock.  This must only be called by the lock's holder: after
-  // a successful call to Try, or a call to Lock.
-  void Unlock();
-
-  // Return the native underlying lock.
-  // TODO(awalker): refactor lock and condition variables so that this is
-  // unnecessary.
-  NativeHandle* native_handle() { return &native_handle_; }
-
- private:
-  NativeHandle native_handle_;
-};
-
-}  // namespace cef_internal
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_LOCK_IMPL_H_

include/base/internal/cef_net_error_list.h

@@ -1,8 +0,0 @@
-// Copyright (c) 2019 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.
-//
-// Include net error codes from the Chromium source location. When creating a
-// CEF binary distribution this file will be replaced with the Chromium version.
-
-#include "net/base/net_error_list.h"

include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h

@@ -1,75 +0,0 @@
-// Copyright (c) 2011 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.
-
-// Do not include this header file directly. Use base/cef_callback.h instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
-
-#include <type_traits>
-
-#include "include/base/cef_template_util.h"
-
-// It is dangerous to post a task with a T* argument where T is a subtype of
-// RefCounted(Base|ThreadSafeBase), since by the time the parameter is used, the
-// object may already have been deleted since it was not held with a
-// scoped_refptr. Example: http://crbug.com/27191
-// The following set of traits are designed to generate a compile error
-// whenever this antipattern is attempted.
-
-namespace base {
-
-// This is a base internal implementation file used by task.h and callback.h.
-// Not for public consumption, so we wrap it in namespace internal.
-namespace internal {
-
-template <typename T, typename = void>
-struct IsRefCountedType : std::false_type {};
-
-template <typename T>
-struct IsRefCountedType<T,
-                        void_t<decltype(std::declval<T*>()->AddRef()),
-                               decltype(std::declval<T*>()->Release())>>
-    : std::true_type {};
-
-// Human readable translation: you needed to be a scoped_refptr if you are a raw
-// pointer type and are convertible to a RefCounted(Base|ThreadSafeBase) type.
-template <typename T>
-struct NeedsScopedRefptrButGetsRawPtr
-    : conjunction<std::is_pointer<T>,
-                  IsRefCountedType<std::remove_pointer_t<T>>> {
-  static_assert(!std::is_reference<T>::value,
-                "NeedsScopedRefptrButGetsRawPtr requires non-reference type.");
-};
-
-}  // namespace internal
-
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_

include/base/internal/cef_scoped_block_mac.h

@@ -1,66 +0,0 @@
-// Copyright (c) 2013 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.
-
-// Do not include this header file directly. Use base/mac/scoped_block.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_BLOCK_MAC_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_BLOCK_MAC_H_
-
-#include <Block.h>
-
-#include "include/base/cef_scoped_typeref_mac.h"
-
-#if defined(__has_feature) && __has_feature(objc_arc)
-#error "Cannot include include/base/internal/cef_scoped_block_mac.h in file built with ARC."
-#endif
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-template <typename B>
-struct ScopedBlockTraits {
-  static B InvalidValue() { return nullptr; }
-  static B Retain(B block) { return Block_copy(block); }
-  static void Release(B block) { Block_release(block); }
-};
-
-}  // namespace internal
-
-// ScopedBlock<> is patterned after ScopedCFTypeRef<>, but uses Block_copy() and
-// Block_release() instead of CFRetain() and CFRelease().
-template <typename B>
-using ScopedBlock = ScopedTypeRef<B, internal::ScopedBlockTraits<B>>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_BLOCK_MAC_H_

include/base/internal/cef_scoped_policy.h

@@ -1,53 +0,0 @@
-// 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.
-
-// Do not include this header file directly. Use base/memory/scoped_policy.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
-
-namespace base {
-namespace scoped_policy {
-
-// Defines the ownership policy for a scoped object.
-enum OwnershipPolicy {
-  // The scoped object takes ownership of an object by taking over an existing
-  // ownership claim.
-  ASSUME,
-
-  // The scoped object will retain the object and any initial ownership is
-  // not changed.
-  RETAIN
-};
-
-}  // namespace scoped_policy
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_

include/base/internal/cef_thread_checker_impl.h

@@ -1,72 +0,0 @@
-// Copyright (c) 2011 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.
-
-// Do not include this header file directly. Use base/cef_thread_checker.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_THREAD_CHECKER_IMPL_H_
-#define CEF_INCLUDE_BASE_INTERNAL_THREAD_CHECKER_IMPL_H_
-
-#include "include/base/cef_lock.h"
-#include "include/base/cef_platform_thread.h"
-
-namespace base {
-namespace cef_internal {
-
-// Real implementation of ThreadChecker, for use in debug mode, or
-// for temporary use in release mode (e.g. to CHECK on a threading issue
-// seen only in the wild).
-//
-// Note: You should almost always use the ThreadChecker class to get the
-// right version for your build configuration.
-class ThreadCheckerImpl {
- public:
-  ThreadCheckerImpl();
-  ~ThreadCheckerImpl();
-
-  bool CalledOnValidThread() const;
-
-  // Changes the thread that is checked for in CalledOnValidThread.  This may
-  // be useful when an object may be created on one thread and then used
-  // exclusively on another thread.
-  void DetachFromThread();
-
- private:
-  void EnsureThreadIdAssigned() const;
-
-  mutable base::Lock lock_;
-  // This is mutable so that CalledOnValidThread can set it.
-  // It's guarded by |lock_|.
-  mutable PlatformThreadRef valid_thread_id_;
-};
-
-}  // namespace cef_internal
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_THREAD_CHECKER_IMPL_H_

include/capi/cef_accessibility_handler_capi.h

@@ -1,81 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=306e44d49ab6198a0fa1bcea50e8a25ee18672be$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_values_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Implement this structure to receive accessibility notification when
-// accessibility events have been registered. The functions of this structure
-// will be called on the UI thread.
-///
-typedef struct _cef_accessibility_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called after renderer process sends accessibility tree changes to the
-  // browser process.
-  ///
-  void(CEF_CALLBACK* on_accessibility_tree_change)(
-      struct _cef_accessibility_handler_t* self,
-      struct _cef_value_t* value);
-
-  ///
-  // Called after renderer process sends accessibility location changes to the
-  // browser process.
-  ///
-  void(CEF_CALLBACK* on_accessibility_location_change)(
-      struct _cef_accessibility_handler_t* self,
-      struct _cef_value_t* value);
-} cef_accessibility_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_ACCESSIBILITY_HANDLER_CAPI_H_

include/capi/cef_app_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,136 +33,42 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=665709ecf3ebad59e85285d319eae72197b9766f$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_process_handler_capi.h"
-#include "include/capi/cef_command_line_capi.h"
-#include "include/capi/cef_render_process_handler_capi.h"
-#include "include/capi/cef_resource_bundle_handler_capi.h"
-#include "include/capi/cef_scheme_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _cef_app_t;
+#include "include/capi/cef_base_capi.h"
 
-///
-// Implement this structure to provide handler implementations. Methods will be
-// called by the process and/or thread indicated.
-///
-typedef struct _cef_app_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Provides an opportunity to view and/or modify command-line arguments before
-  // processing by CEF and Chromium. The |process_type| value will be NULL for
-  // the browser process. Do not keep a reference to the cef_command_line_t
-  // object passed to this function. The CefSettings.command_line_args_disabled
-  // value can be used to start with an NULL command-line object. Any values
-  // specified in CefSettings that equate to command-line arguments will be set
-  // before this function is called. Be cautious when using this function to
-  // modify command-line arguments for non-browser processes as this may result
-  // in undefined behavior including crashes.
-  ///
-  void(CEF_CALLBACK* on_before_command_line_processing)(
-      struct _cef_app_t* self,
-      const cef_string_t* process_type,
-      struct _cef_command_line_t* command_line);
-
-  ///
-  // Provides an opportunity to register custom schemes. Do not keep a reference
-  // to the |registrar| object. This function is called on the main thread for
-  // each process and the registered schemes should be the same across all
-  // processes.
-  ///
-  void(CEF_CALLBACK* on_register_custom_schemes)(
-      struct _cef_app_t* self,
-      struct _cef_scheme_registrar_t* registrar);
-
-  ///
-  // Return the handler for resource bundle events. If
-  // CefSettings.pack_loading_disabled is true (1) a handler must be returned.
-  // If no handler is returned resources will be loaded from pack files. This
-  // function is called by the browser and render processes on multiple threads.
-  ///
-  struct _cef_resource_bundle_handler_t*(
-      CEF_CALLBACK* get_resource_bundle_handler)(struct _cef_app_t* self);
-
-  ///
-  // Return the handler for functionality specific to the browser process. This
-  // function is called on multiple threads in the browser process.
-  ///
-  struct _cef_browser_process_handler_t*(
-      CEF_CALLBACK* get_browser_process_handler)(struct _cef_app_t* self);
-
-  ///
-  // Return the handler for functionality specific to the render process. This
-  // function is called on the render process main thread.
-  ///
-  struct _cef_render_process_handler_t*(
-      CEF_CALLBACK* get_render_process_handler)(struct _cef_app_t* self);
-} cef_app_t;
-
-///
-// This function should be called from the application entry point function to
-// execute a secondary process. It can be used to run secondary processes from
-// the browser client executable (default behavior) or from a separate
-// executable specified by the CefSettings.browser_subprocess_path value. If
-// called for the browser process (identified by no "type" command-line value)
-// it will return immediately with a value of -1. If called for a recognized
-// secondary process it will block until the process should exit and then return
-// the process exit code. The |application| parameter may be NULL. The
-// |windows_sandbox_info| parameter is only used on Windows and may be NULL (see
-// cef_sandbox_win.h for details).
-///
-CEF_EXPORT int cef_execute_process(const struct _cef_main_args_t* args,
-                                   cef_app_t* application,
-                                   void* windows_sandbox_info);
 
 ///
 // This function should be called on the main application thread to initialize
-// the CEF browser process. The |application| parameter may be NULL. A return
-// value of true (1) indicates that it succeeded and false (0) indicates that it
-// failed. The |windows_sandbox_info| parameter is only used on Windows and may
-// be NULL (see cef_sandbox_win.h for details).
+// CEF when the application is started. The |application| parameter may be NULL.
+// A return value of true (1) indicates that it succeeded and false (0)
+// indicates that it failed.
 ///
-CEF_EXPORT int cef_initialize(const struct _cef_main_args_t* args,
-                              const struct _cef_settings_t* settings,
-                              cef_app_t* application,
-                              void* windows_sandbox_info);
+CEF_EXPORT int cef_initialize(const struct _cef_settings_t* settings,
+    struct _cef_app_t* application);
 
 ///
 // This function should be called on the main application thread to shut down
-// the CEF browser process before the application exits.
+// CEF before the application exits.
 ///
-CEF_EXPORT void cef_shutdown(void);
+CEF_EXPORT void cef_shutdown();
 
 ///
 // Perform a single iteration of CEF message loop processing. This function is
-// provided for cases where the CEF message loop must be integrated into an
-// existing application message loop. Use of this function is not recommended
-// for most users; use either the cef_run_message_loop() function or
-// CefSettings.multi_threaded_message_loop if possible. When using this function
-// care must be taken to balance performance against excessive CPU usage. It is
-// recommended to enable the CefSettings.external_message_pump option when using
-// this function so that
-// cef_browser_process_handler_t::on_schedule_message_pump_work() callbacks can
-// facilitate the scheduling process. This function should only be called on the
-// main application thread and only if cef_initialize() is called with a
-// CefSettings.multi_threaded_message_loop value of false (0). This function
-// will not block.
+// used to integrate the CEF message loop into an existing application message
+// loop. Care must be taken to balance performance against excessive CPU usage.
+// This function should only be called on the main application thread and only
+// if cef_initialize() is called with a CefSettings.multi_threaded_message_loop
+// value of false (0). This function will not block.
 ///
-CEF_EXPORT void cef_do_message_loop_work(void);
+CEF_EXPORT void cef_do_message_loop_work();
 
 ///
 // Run the CEF message loop. Use this function instead of an application-
@@ -172,27 +78,42 @@ CEF_EXPORT void cef_do_message_loop_work(void);
 // CefSettings.multi_threaded_message_loop value of false (0). This function
 // will block until a quit message is received by the system.
 ///
-CEF_EXPORT void cef_run_message_loop(void);
+CEF_EXPORT void cef_run_message_loop();
 
 ///
 // Quit the CEF message loop that was started by calling cef_run_message_loop().
 // This function should only be called on the main application thread and only
 // if cef_run_message_loop() was used.
 ///
-CEF_EXPORT void cef_quit_message_loop(void);
+CEF_EXPORT void cef_quit_message_loop();
 
 ///
-// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a
-// modal message loop. Set to false (0) after exiting the modal message loop.
+// Implement this structure to provide handler implementations. Methods will be
+// called on the thread indicated.
 ///
-CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);
+typedef struct _cef_app_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Return the handler for resource bundle events. If
+  // CefSettings.pack_loading_disabled is true (1) a handler must be returned.
+  // If no handler is returned resources will be loaded from pack files. This
+  // function is called on multiple threads.
+  ///
+  struct _cef_resource_bundle_handler_t* (
+      CEF_CALLBACK *get_resource_bundle_handler)(struct _cef_app_t* self);
+
+  ///
+  // Return the handler for proxy events. If not handler is returned the default
+  // system handler will be used. This function is called on the IO thread.
+  ///
+  struct _cef_proxy_handler_t* (CEF_CALLBACK *get_proxy_handler)(
+      struct _cef_app_t* self);
+} cef_app_t;
 
-///
-// Call during process startup to enable High-DPI support on Windows 7 or newer.
-// Older versions of Windows should be left DPI-unaware because they do not
-// support DirectWrite and GDI fonts are kerned very badly.
-///
-CEF_EXPORT void cef_enable_highdpi_support(void);
 
 #ifdef __cplusplus
 }

include/capi/cef_audio_handler_capi.h

@@ -1,121 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=fd8d34089842ee8f8490ef1828c3091d12052e28$
-//
-
-#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_

include/capi/cef_base_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2011 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
@@ -27,10 +27,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 #ifndef CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_
 
-#include <stdint.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include "include/internal/cef_export.h"
 #include "include/internal/cef_string.h"
@@ -39,66 +42,41 @@
 #include "include/internal/cef_string_multimap.h"
 #include "include/internal/cef_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 ///
-// All ref-counted framework structures must include this structure first.
+// Structure defining the reference count implementation functions. All
+// framework structures must include the cef_base_t structure first.
 ///
-typedef struct _cef_base_ref_counted_t {
+typedef struct _cef_base_t {
   ///
   // Size of the data structure.
   ///
   size_t size;
 
   ///
-  // Called to increment the reference count for the object. Should be called
-  // for every new copy of a pointer to a given object.
+  // Increment the reference count.
   ///
-  void(CEF_CALLBACK* add_ref)(struct _cef_base_ref_counted_t* self);
+  int (CEF_CALLBACK *add_ref)(struct _cef_base_t* self);
 
   ///
-  // Called to decrement the reference count for the object. If the reference
-  // count falls to 0 the object should self-delete. Returns true (1) if the
-  // resulting reference count is 0.
+  // Decrement the reference count.  Delete this object when no references
+  // remain.
   ///
-  int(CEF_CALLBACK* release)(struct _cef_base_ref_counted_t* self);
+  int (CEF_CALLBACK *release)(struct _cef_base_t* self);
 
   ///
-  // Returns true (1) if the current reference count is 1.
+  // Returns the current number of references.
   ///
-  int(CEF_CALLBACK* has_one_ref)(struct _cef_base_ref_counted_t* self);
+  int (CEF_CALLBACK *get_refct)(struct _cef_base_t* self);
+} cef_base_t;
 
-  ///
-  // Returns true (1) if the current reference count is at least 1.
-  ///
-  int(CEF_CALLBACK* has_at_least_one_ref)(struct _cef_base_ref_counted_t* self);
-} cef_base_ref_counted_t;
 
-///
-// All scoped framework structures must include this structure first.
-///
-typedef struct _cef_base_scoped_t {
-  ///
-  // Size of the data structure.
-  ///
-  size_t size;
+// Check that the structure |s|, which is defined with a cef_base_t member named
+// |base|, is large enough to contain the specified member |f|.
+#define CEF_MEMBER_EXISTS(s, f)   \
+  ((intptr_t)&((s)->f) - (intptr_t)(s) + sizeof((s)->f) <= (s)->base.size)
 
-  ///
-  // Called to delete this object. May be NULL if the object is not owned.
-  ///
-  void(CEF_CALLBACK* del)(struct _cef_base_scoped_t* self);
+#define CEF_MEMBER_MISSING(s, f)  (!CEF_MEMBER_EXISTS(s, f) || !((s)->f))
 
-} cef_base_scoped_t;
-
-// Check that the structure |s|, which is defined with a size_t member at the
-// top, is large enough to contain the specified member |f|.
-#define CEF_MEMBER_EXISTS(s, f) \
-  ((intptr_t) &                 \
-   ((s)->f) - (intptr_t)(s) + sizeof((s)->f) <= *reinterpret_cast<size_t*>(s))
-
-#define CEF_MEMBER_MISSING(s, f) (!CEF_MEMBER_EXISTS(s, f) || !((s)->f))
 
 #ifdef __cplusplus
 }

include/capi/cef_browser_process_handler_capi.h

@@ -1,113 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=ad0a78715daff99c1ec987800b7e5d62196e7100$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
-#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_values_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Structure used to implement browser process callbacks. The functions of this
-// structure will be called on the browser process main thread unless otherwise
-// indicated.
-///
-typedef struct _cef_browser_process_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called on the browser process UI thread immediately after the CEF context
-  // has been initialized.
-  ///
-  void(CEF_CALLBACK* on_context_initialized)(
-      struct _cef_browser_process_handler_t* self);
-
-  ///
-  // Called before a child process is launched. Will be called on the browser
-  // process UI thread when launching a render process and on the browser
-  // process IO thread when launching a GPU process. Provides an opportunity to
-  // modify the child process command line. Do not keep a reference to
-  // |command_line| outside of this function.
-  ///
-  void(CEF_CALLBACK* on_before_child_process_launch)(
-      struct _cef_browser_process_handler_t* self,
-      struct _cef_command_line_t* command_line);
-
-  ///
-  // Called from any thread when work has been scheduled for the browser process
-  // main (UI) thread. This callback is used in combination with CefSettings.
-  // external_message_pump and cef_do_message_loop_work() in cases where the CEF
-  // message loop must be integrated into an existing application message loop
-  // (see additional comments and warnings on CefDoMessageLoopWork). This
-  // callback should schedule a cef_do_message_loop_work() call to happen on the
-  // main (UI) thread. |delay_ms| is the requested delay in milliseconds. If
-  // |delay_ms| is <= 0 then the call should happen reasonably soon. If
-  // |delay_ms| is > 0 then the call should be scheduled to happen after the
-  // specified delay and any currently pending scheduled call should be
-  // cancelled.
-  ///
-  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
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_

include/capi/cef_client_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,36 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8b099ca3b9cfbd41840cdf64586a0b884abaffae$
-//
 
 #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"
-#include "include/capi/cef_display_handler_capi.h"
-#include "include/capi/cef_download_handler_capi.h"
-#include "include/capi/cef_drag_handler_capi.h"
-#include "include/capi/cef_find_handler_capi.h"
-#include "include/capi/cef_focus_handler_capi.h"
-#include "include/capi/cef_frame_handler_capi.h"
-#include "include/capi/cef_jsdialog_handler_capi.h"
-#include "include/capi/cef_keyboard_handler_capi.h"
-#include "include/capi/cef_life_span_handler_capi.h"
-#include "include/capi/cef_load_handler_capi.h"
-#include "include/capi/cef_print_handler_capi.h"
-#include "include/capi/cef_process_message_capi.h"
-#include "include/capi/cef_render_handler_capi.h"
-#include "include/capi/cef_request_handler_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to provide handler implementations.
 ///
@@ -70,124 +52,101 @@ typedef struct _cef_client_t {
   ///
   // Base structure.
   ///
-  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.
-  ///
-  struct _cef_context_menu_handler_t*(CEF_CALLBACK* get_context_menu_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for dialogs. If no handler is provided the default
-  // implementation will be used.
-  ///
-  struct _cef_dialog_handler_t*(CEF_CALLBACK* get_dialog_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for browser display state events.
-  ///
-  struct _cef_display_handler_t*(CEF_CALLBACK* get_display_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for download events. If no handler is returned downloads
-  // will not be allowed.
-  ///
-  struct _cef_download_handler_t*(CEF_CALLBACK* get_download_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for drag events.
-  ///
-  struct _cef_drag_handler_t*(CEF_CALLBACK* get_drag_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for find result events.
-  ///
-  struct _cef_find_handler_t*(CEF_CALLBACK* get_find_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for focus events.
-  ///
-  struct _cef_focus_handler_t*(CEF_CALLBACK* get_focus_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for events related to cef_frame_t lifespan. This
-  // function will be called once during cef_browser_t creation and the result
-  // will be cached for performance reasons.
-  ///
-  struct _cef_frame_handler_t*(CEF_CALLBACK* get_frame_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for JavaScript dialogs. If no handler is provided the
-  // default implementation will be used.
-  ///
-  struct _cef_jsdialog_handler_t*(CEF_CALLBACK* get_jsdialog_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for keyboard events.
-  ///
-  struct _cef_keyboard_handler_t*(CEF_CALLBACK* get_keyboard_handler)(
-      struct _cef_client_t* self);
+  cef_base_t base;
 
   ///
   // Return the handler for browser life span events.
   ///
-  struct _cef_life_span_handler_t*(CEF_CALLBACK* get_life_span_handler)(
+  struct _cef_life_span_handler_t* (CEF_CALLBACK *get_life_span_handler)(
       struct _cef_client_t* self);
 
   ///
   // Return the handler for browser load status events.
   ///
-  struct _cef_load_handler_t*(CEF_CALLBACK* get_load_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for printing on Linux. If a print handler is not
-  // provided then printing will not be supported on the Linux platform.
-  ///
-  struct _cef_print_handler_t*(CEF_CALLBACK* get_print_handler)(
-      struct _cef_client_t* self);
-
-  ///
-  // Return the handler for off-screen rendering events.
-  ///
-  struct _cef_render_handler_t*(CEF_CALLBACK* get_render_handler)(
+  struct _cef_load_handler_t* (CEF_CALLBACK *get_load_handler)(
       struct _cef_client_t* self);
 
   ///
   // Return the handler for browser request events.
   ///
-  struct _cef_request_handler_t*(CEF_CALLBACK* get_request_handler)(
+  struct _cef_request_handler_t* (CEF_CALLBACK *get_request_handler)(
       struct _cef_client_t* self);
 
   ///
-  // Called when a new message is received from a different process. Return true
-  // (1) if the message was handled or false (0) otherwise.  It is safe to keep
-  // a reference to |message| outside of this callback.
+  // Return the handler for browser display state events.
   ///
-  int(CEF_CALLBACK* on_process_message_received)(
-      struct _cef_client_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      cef_process_id_t source_process,
-      struct _cef_process_message_t* message);
+  struct _cef_display_handler_t* (CEF_CALLBACK *get_display_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for focus events.
+  ///
+  struct _cef_focus_handler_t* (CEF_CALLBACK *get_focus_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for keyboard events.
+  ///
+  struct _cef_keyboard_handler_t* (CEF_CALLBACK *get_keyboard_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for context menu events.
+  ///
+  struct _cef_menu_handler_t* (CEF_CALLBACK *get_menu_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for browser permission events.
+  ///
+  struct _cef_permission_handler_t* (CEF_CALLBACK *get_permission_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for printing events.
+  ///
+  struct _cef_print_handler_t* (CEF_CALLBACK *get_print_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for find result events.
+  ///
+  struct _cef_find_handler_t* (CEF_CALLBACK *get_find_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for JavaScript dialog events.
+  ///
+  struct _cef_jsdialog_handler_t* (CEF_CALLBACK *get_jsdialog_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for V8 context events.
+  ///
+  struct _cef_v8context_handler_t* (CEF_CALLBACK *get_v8context_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for off-screen rendering events.
+  ///
+  struct _cef_render_handler_t* (CEF_CALLBACK *get_render_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for drag events.
+  ///
+  struct _cef_drag_handler_t* (CEF_CALLBACK *get_drag_handler)(
+      struct _cef_client_t* self);
+
+  ///
+  // Return the handler for zoom events. If no handler is provided the default
+  // zoom behavior will be used.
+  ///
+  struct _cef_zoom_handler_t* (CEF_CALLBACK *get_zoom_handler)(
+      struct _cef_client_t* self);
 } cef_client_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_command_line_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,19 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=3049c9960a95d32d61cc57ae998c0eba12820673$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Structure used to create and/or parse command line arguments. Arguments with
 // '--', '-' and, on Windows, '/' prefixes are considered switches. Switches
@@ -53,160 +52,115 @@ extern "C" {
 // optionally have a value specified using the '=' delimiter (e.g.
 // "-switch=value"). An argument of "--" will terminate switch parsing with all
 // subsequent tokens, regardless of prefix, being interpreted as non-switch
-// arguments. Switch names should be lowercase ASCII and will be converted to
-// such if necessary. Switch values will retain the original case and UTF8
-// encoding. This structure can be used before cef_initialize() is called.
+// arguments. Switch names are considered case-insensitive. This structure can
+// be used before cef_initialize() is called.
 ///
 typedef struct _cef_command_line_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this object is valid. Do not call any other functions
-  // if this function returns false (0).
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_command_line_t* self);
-
-  ///
-  // Returns true (1) if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
-  ///
-  int(CEF_CALLBACK* is_read_only)(struct _cef_command_line_t* self);
-
-  ///
-  // Returns a writable copy of this object.
-  ///
-  struct _cef_command_line_t*(CEF_CALLBACK* copy)(
-      struct _cef_command_line_t* self);
+  cef_base_t base;
 
   ///
   // Initialize the command line with the specified |argc| and |argv| values.
   // The first argument must be the name of the program. This function is only
   // supported on non-Windows platforms.
   ///
-  void(CEF_CALLBACK* init_from_argv)(struct _cef_command_line_t* self,
-                                     int argc,
-                                     const char* const* argv);
+  void (CEF_CALLBACK *init_from_argv)(struct _cef_command_line_t* self,
+      int argc, const char* const* argv);
 
   ///
   // Initialize the command line with the string returned by calling
   // GetCommandLineW(). This function is only supported on Windows.
   ///
-  void(CEF_CALLBACK* init_from_string)(struct _cef_command_line_t* self,
-                                       const cef_string_t* command_line);
-
-  ///
-  // Reset the command-line switches and arguments but leave the program
-  // component unchanged.
-  ///
-  void(CEF_CALLBACK* reset)(struct _cef_command_line_t* self);
-
-  ///
-  // Retrieve the original command line string as a vector of strings. The argv
-  // array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
-  ///
-  void(CEF_CALLBACK* get_argv)(struct _cef_command_line_t* self,
-                               cef_string_list_t argv);
+  void (CEF_CALLBACK *init_from_string)(struct _cef_command_line_t* self,
+      const cef_string_t* command_line);
 
   ///
   // Constructs and returns the represented command line string. Use this
   // function cautiously because quoting behavior is unclear.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_command_line_string)(
+  cef_string_userfree_t (CEF_CALLBACK *get_command_line_string)(
       struct _cef_command_line_t* self);
 
   ///
   // Get the program part of the command line string (the first item).
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_program)(
+  cef_string_userfree_t (CEF_CALLBACK *get_program)(
       struct _cef_command_line_t* self);
 
   ///
   // Set the program part of the command line string (the first item).
   ///
-  void(CEF_CALLBACK* set_program)(struct _cef_command_line_t* self,
-                                  const cef_string_t* program);
+  void (CEF_CALLBACK *set_program)(struct _cef_command_line_t* self,
+      const cef_string_t* program);
 
   ///
   // Returns true (1) if the command line has switches.
   ///
-  int(CEF_CALLBACK* has_switches)(struct _cef_command_line_t* self);
+  int (CEF_CALLBACK *has_switches)(struct _cef_command_line_t* self);
 
   ///
   // Returns true (1) if the command line contains the given switch.
   ///
-  int(CEF_CALLBACK* has_switch)(struct _cef_command_line_t* self,
-                                const cef_string_t* name);
+  int (CEF_CALLBACK *has_switch)(struct _cef_command_line_t* self,
+      const cef_string_t* name);
 
   ///
   // Returns the value associated with the given switch. If the switch has no
   // value or isn't present this function returns the NULL string.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_switch_value)(
-      struct _cef_command_line_t* self,
-      const cef_string_t* name);
+  cef_string_userfree_t (CEF_CALLBACK *get_switch_value)(
+      struct _cef_command_line_t* self, const cef_string_t* name);
 
   ///
   // Returns the map of switch names and values. If a switch has no value an
   // NULL string is returned.
   ///
-  void(CEF_CALLBACK* get_switches)(struct _cef_command_line_t* self,
-                                   cef_string_map_t switches);
+  void (CEF_CALLBACK *get_switches)(struct _cef_command_line_t* self,
+      cef_string_map_t switches);
 
   ///
   // Add a switch to the end of the command line. If the switch has no value
   // pass an NULL value string.
   ///
-  void(CEF_CALLBACK* append_switch)(struct _cef_command_line_t* self,
-                                    const cef_string_t* name);
+  void (CEF_CALLBACK *append_switch)(struct _cef_command_line_t* self,
+      const cef_string_t* name);
 
   ///
   // Add a switch with the specified value to the end of the command line.
   ///
-  void(CEF_CALLBACK* append_switch_with_value)(struct _cef_command_line_t* self,
-                                               const cef_string_t* name,
-                                               const cef_string_t* value);
+  void (CEF_CALLBACK *append_switch_with_value)(
+      struct _cef_command_line_t* self, const cef_string_t* name,
+      const cef_string_t* value);
 
   ///
   // True if there are remaining command line arguments.
   ///
-  int(CEF_CALLBACK* has_arguments)(struct _cef_command_line_t* self);
+  int (CEF_CALLBACK *has_arguments)(struct _cef_command_line_t* self);
 
   ///
   // Get the remaining command line arguments.
   ///
-  void(CEF_CALLBACK* get_arguments)(struct _cef_command_line_t* self,
-                                    cef_string_list_t arguments);
+  void (CEF_CALLBACK *get_arguments)(struct _cef_command_line_t* self,
+      cef_string_list_t arguments);
 
   ///
   // Add an argument to the end of the command line.
   ///
-  void(CEF_CALLBACK* append_argument)(struct _cef_command_line_t* self,
-                                      const cef_string_t* argument);
-
-  ///
-  // Insert a command before the current command. Common for debuggers, like
-  // "valgrind" or "gdb --args".
-  ///
-  void(CEF_CALLBACK* prepend_wrapper)(struct _cef_command_line_t* self,
-                                      const cef_string_t* wrapper);
+  void (CEF_CALLBACK *append_argument)(struct _cef_command_line_t* self,
+      const cef_string_t* argument);
 } cef_command_line_t;
 
+
 ///
 // Create a new cef_command_line_t instance.
 ///
-CEF_EXPORT cef_command_line_t* cef_command_line_create(void);
+CEF_EXPORT cef_command_line_t* cef_command_line_create();
 
-///
-// Returns the singleton global cef_command_line_t object. The returned object
-// will be read-only.
-///
-CEF_EXPORT cef_command_line_t* cef_command_line_get_global(void);
 
 #ifdef __cplusplus
 }

include/capi/cef_content_filter_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,56 +33,48 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=10ef5088ce2a5c6ffb38f8864d3aad6e5ac88b40$
-//
 
-#ifndef CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
+#ifndef CEF_INCLUDE_CAPI_CEF_CONTENT_FILTER_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_CONTENT_FILTER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
-// Generic callback structure used for asynchronous continuation.
+// Structure to implement for filtering response content. The functions of this
+// structure will always be called on the UI thread.
 ///
-typedef struct _cef_callback_t {
+typedef struct _cef_content_filter_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Continue processing.
+  // Set |substitute_data| to the replacement for the data in |data| if data
+  // should be modified.
   ///
-  void(CEF_CALLBACK* cont)(struct _cef_callback_t* self);
+  void (CEF_CALLBACK *process_data)(struct _cef_content_filter_t* self,
+      const void* data, int data_size,
+      struct _cef_stream_reader_t** substitute_data);
 
   ///
-  // Cancel processing.
+  // Called when there is no more data to be processed. It is expected that
+  // whatever data was retained in the last process_data() call, it should be
+  // returned now by setting |remainder| if appropriate.
   ///
-  void(CEF_CALLBACK* cancel)(struct _cef_callback_t* self);
-} cef_callback_t;
+  void (CEF_CALLBACK *drain)(struct _cef_content_filter_t* self,
+      struct _cef_stream_reader_t** remainder);
+} cef_content_filter_t;
 
-///
-// Generic callback structure used for asynchronous completion.
-///
-typedef struct _cef_completion_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Method that will be called once the task is complete.
-  ///
-  void(CEF_CALLBACK* on_complete)(struct _cef_completion_callback_t* self);
-} cef_completion_callback_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
+#endif  // CEF_INCLUDE_CAPI_CEF_CONTENT_FILTER_CAPI_H_

include/capi/cef_context_menu_handler_capi.h

@@ -1,302 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=d007b3dc26f3f049bf67623da8fae59dc75a193b$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_frame_capi.h"
-#include "include/capi/cef_menu_model_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_context_menu_params_t;
-
-///
-// Callback structure used for continuation of custom context menu display.
-///
-typedef struct _cef_run_context_menu_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Complete context menu display by selecting the specified |command_id| and
-  // |event_flags|.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_run_context_menu_callback_t* self,
-                           int command_id,
-                           cef_event_flags_t event_flags);
-
-  ///
-  // Cancel context menu display.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_run_context_menu_callback_t* self);
-} cef_run_context_menu_callback_t;
-
-///
-// Implement this structure to handle context menu events. The functions of this
-// structure will be called on the UI thread.
-///
-typedef struct _cef_context_menu_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called before a context menu is displayed. |params| provides information
-  // about the context menu state. |model| initially contains the default
-  // context menu. The |model| can be cleared to show no context menu or
-  // modified to show a custom menu. Do not keep references to |params| or
-  // |model| outside of this callback.
-  ///
-  void(CEF_CALLBACK* on_before_context_menu)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      struct _cef_context_menu_params_t* params,
-      struct _cef_menu_model_t* model);
-
-  ///
-  // Called to allow custom display of the context menu. |params| provides
-  // information about the context menu state. |model| contains the context menu
-  // model resulting from OnBeforeContextMenu. For custom display return true
-  // (1) and execute |callback| either synchronously or asynchronously with the
-  // selected command ID. For default display return false (0). Do not keep
-  // references to |params| or |model| outside of this callback.
-  ///
-  int(CEF_CALLBACK* run_context_menu)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      struct _cef_context_menu_params_t* params,
-      struct _cef_menu_model_t* model,
-      struct _cef_run_context_menu_callback_t* callback);
-
-  ///
-  // Called to execute a command selected from the context menu. Return true (1)
-  // if the command was handled or false (0) for the default implementation. See
-  // cef_menu_id_t for the command ids that have default implementations. All
-  // user-defined command ids should be between MENU_ID_USER_FIRST and
-  // MENU_ID_USER_LAST. |params| will have the same values as what was passed to
-  // on_before_context_menu(). Do not keep a reference to |params| outside of
-  // this callback.
-  ///
-  int(CEF_CALLBACK* on_context_menu_command)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      struct _cef_context_menu_params_t* params,
-      int command_id,
-      cef_event_flags_t event_flags);
-
-  ///
-  // Called when the context menu is dismissed irregardless of whether the menu
-  // was NULL or a command was selected.
-  ///
-  void(CEF_CALLBACK* on_context_menu_dismissed)(
-      struct _cef_context_menu_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame);
-} cef_context_menu_handler_t;
-
-///
-// Provides information about the context menu state. The ethods of this
-// structure can only be accessed on browser process the UI thread.
-///
-typedef struct _cef_context_menu_params_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns the X coordinate of the mouse where the context menu was invoked.
-  // Coords are relative to the associated RenderView's origin.
-  ///
-  int(CEF_CALLBACK* get_xcoord)(struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the Y coordinate of the mouse where the context menu was invoked.
-  // Coords are relative to the associated RenderView's origin.
-  ///
-  int(CEF_CALLBACK* get_ycoord)(struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns flags representing the type of node that the context menu was
-  // invoked on.
-  ///
-  cef_context_menu_type_flags_t(CEF_CALLBACK* get_type_flags)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the URL of the link, if any, that encloses the node that the
-  // context menu was invoked on.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_link_url)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the link URL, if any, to be used ONLY for "copy link address". We
-  // don't validate this field in the frontend process.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_unfiltered_link_url)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the source URL, if any, for the element that the context menu was
-  // invoked on. Example of elements with source URLs are img, audio, and video.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_source_url)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns true (1) if the context menu was invoked on an image which has non-
-  // NULL contents.
-  ///
-  int(CEF_CALLBACK* has_image_contents)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the title text or the alt text if the context menu was invoked on
-  // an image.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_title_text)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the URL of the top level page that the context menu was invoked on.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_page_url)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the URL of the subframe that the context menu was invoked on.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_frame_url)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the character encoding of the subframe that the context menu was
-  // invoked on.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_frame_charset)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the type of context node that the context menu was invoked on.
-  ///
-  cef_context_menu_media_type_t(CEF_CALLBACK* get_media_type)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns flags representing the actions supported by the media element, if
-  // any, that the context menu was invoked on.
-  ///
-  cef_context_menu_media_state_flags_t(CEF_CALLBACK* get_media_state_flags)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the text of the selection, if any, that the context menu was
-  // invoked on.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_selection_text)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns the text of the misspelled word, if any, that the context menu was
-  // invoked on.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_misspelled_word)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns true (1) if suggestions exist, false (0) otherwise. Fills in
-  // |suggestions| from the spell check service for the misspelled word if there
-  // is one.
-  ///
-  int(CEF_CALLBACK* get_dictionary_suggestions)(
-      struct _cef_context_menu_params_t* self,
-      cef_string_list_t suggestions);
-
-  ///
-  // Returns true (1) if the context menu was invoked on an editable node.
-  ///
-  int(CEF_CALLBACK* is_editable)(struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns true (1) if the context menu was invoked on an editable node where
-  // spell-check is enabled.
-  ///
-  int(CEF_CALLBACK* is_spell_check_enabled)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns flags representing the actions supported by the editable node, if
-  // any, that the context menu was invoked on.
-  ///
-  cef_context_menu_edit_state_flags_t(CEF_CALLBACK* get_edit_state_flags)(
-      struct _cef_context_menu_params_t* self);
-
-  ///
-  // Returns true (1) if the context menu contains items specified by the
-  // renderer process.
-  ///
-  int(CEF_CALLBACK* is_custom_menu)(struct _cef_context_menu_params_t* self);
-} cef_context_menu_params_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_

include/capi/cef_cookie_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,23 +33,17 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=d9790a35d74621e985b917935a4fca74ba7db1e0$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_callback_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _cef_cookie_visitor_t;
-struct _cef_delete_cookies_callback_t;
-struct _cef_set_cookie_callback_t;
+#include "include/capi/cef_base_capi.h"
+
 
 ///
 // Structure used for managing cookies. The functions of this structure may be
@@ -59,88 +53,90 @@ typedef struct _cef_cookie_manager_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Visit all cookies on the UI thread. The returned cookies are ordered by
-  // longest path, then by earliest creation date. Returns false (0) if cookies
-  // cannot be accessed.
+  // Set the schemes supported by this manager. By default only "http" and
+  // "https" schemes are supported. Must be called before any cookies are
+  // accessed.
   ///
-  int(CEF_CALLBACK* visit_all_cookies)(struct _cef_cookie_manager_t* self,
-                                       struct _cef_cookie_visitor_t* visitor);
+  void (CEF_CALLBACK *set_supported_schemes)(struct _cef_cookie_manager_t* self,
+      cef_string_list_t schemes);
 
   ///
-  // Visit a subset of cookies on the UI thread. The results are filtered by the
-  // given url scheme, host, domain and path. If |includeHttpOnly| is true (1)
-  // HTTP-only cookies will also be included in the results. The returned
-  // cookies are ordered by longest path, then by earliest creation date.
-  // Returns false (0) if cookies cannot be accessed.
+  // Visit all cookies. The returned cookies are ordered by longest path, then
+  // by earliest creation date. Returns false (0) if cookies cannot be accessed.
   ///
-  int(CEF_CALLBACK* visit_url_cookies)(struct _cef_cookie_manager_t* self,
-                                       const cef_string_t* url,
-                                       int includeHttpOnly,
-                                       struct _cef_cookie_visitor_t* visitor);
+  int (CEF_CALLBACK *visit_all_cookies)(struct _cef_cookie_manager_t* self,
+      struct _cef_cookie_visitor_t* visitor);
+
+  ///
+  // Visit a subset of cookies. The results are filtered by the given url
+  // scheme, host, domain and path. If |includeHttpOnly| is true (1) HTTP-only
+  // cookies will also be included in the results. The returned cookies are
+  // ordered by longest path, then by earliest creation date. Returns false (0)
+  // if cookies cannot be accessed.
+  ///
+  int (CEF_CALLBACK *visit_url_cookies)(struct _cef_cookie_manager_t* self,
+      const cef_string_t* url, int includeHttpOnly,
+      struct _cef_cookie_visitor_t* visitor);
 
   ///
   // Sets a cookie given a valid URL and explicit user-provided cookie
   // attributes. This function expects each attribute to be well-formed. It will
   // check for disallowed characters (e.g. the ';' character is disallowed
-  // within the cookie value attribute) and fail without setting the cookie if
-  // such characters are found. If |callback| is non-NULL it will be executed
-  // asnychronously on the UI thread after the cookie has been set. Returns
-  // false (0) if an invalid URL is specified or if cookies cannot be accessed.
+  // within the cookie value attribute) and will return false (0) without
+  // setting the cookie if such characters are found. This function must be
+  // called on the IO thread.
   ///
-  int(CEF_CALLBACK* set_cookie)(struct _cef_cookie_manager_t* self,
-                                const cef_string_t* url,
-                                const struct _cef_cookie_t* cookie,
-                                struct _cef_set_cookie_callback_t* callback);
+  int (CEF_CALLBACK *set_cookie)(struct _cef_cookie_manager_t* self,
+      const cef_string_t* url, const struct _cef_cookie_t* cookie);
 
   ///
   // Delete all cookies that match the specified parameters. If both |url| and
-  // |cookie_name| values are specified all host and domain cookies matching
+  // values |cookie_name| are specified all host and domain cookies matching
   // both will be deleted. If only |url| is specified all host cookies (but not
   // domain cookies) irrespective of path will be deleted. If |url| is NULL all
-  // cookies for all hosts and domains will be deleted. If |callback| is non-
-  // NULL it will be executed asnychronously on the UI thread after the cookies
-  // have been deleted. Returns false (0) if a non-NULL invalid URL is specified
-  // or if cookies cannot be accessed. Cookies can alternately be deleted using
-  // the Visit*Cookies() functions.
+  // cookies for all hosts and domains will be deleted. Returns false (0) if a
+  // non- NULL invalid URL is specified or if cookies cannot be accessed. This
+  // function must be called on the IO thread.
   ///
-  int(CEF_CALLBACK* delete_cookies)(
-      struct _cef_cookie_manager_t* self,
-      const cef_string_t* url,
-      const cef_string_t* cookie_name,
-      struct _cef_delete_cookies_callback_t* callback);
+  int (CEF_CALLBACK *delete_cookies)(struct _cef_cookie_manager_t* self,
+      const cef_string_t* url, const cef_string_t* cookie_name);
 
   ///
-  // Flush the backing store (if any) to disk. If |callback| is non-NULL it will
-  // be executed asnychronously on the UI thread after the flush is complete.
-  // Returns false (0) if cookies cannot be accessed.
+  // Sets the directory path that will be used for storing cookie data. If
+  // |path| is NULL data will be stored in memory only. Returns false (0) if
+  // cookies cannot be accessed.
   ///
-  int(CEF_CALLBACK* flush_store)(struct _cef_cookie_manager_t* self,
-                                 struct _cef_completion_callback_t* callback);
+  int (CEF_CALLBACK *set_storage_path)(struct _cef_cookie_manager_t* self,
+      const cef_string_t* path);
 } cef_cookie_manager_t;
 
+
 ///
 // Returns the global cookie manager. By default data will be stored at
-// CefSettings.cache_path if specified or in memory otherwise. If |callback| is
-// non-NULL it will be executed asnychronously on the UI thread after the
-// manager's storage has been initialized. Using this function is equivalent to
-// calling cef_request_context_t::cef_request_context_get_global_context()->GetD
-// efaultCookieManager().
+// CefSettings.cache_path if specified or in memory otherwise.
 ///
-CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager(
-    struct _cef_completion_callback_t* callback);
+CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager();
+
+///
+// Creates a new cookie manager. If |path| is NULL data will be stored in memory
+// only. Returns NULL if creation fails.
+///
+CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_create_manager(
+    const cef_string_t* path);
+
 
 ///
 // Structure to implement for visiting cookie values. The functions of this
-// structure will always be called on the UI thread.
+// structure will always be called on the IO thread.
 ///
 typedef struct _cef_cookie_visitor_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
   // Method that will be called once for each cookie. |count| is the 0-based
@@ -149,48 +145,11 @@ typedef struct _cef_cookie_visitor_t {
   // Return false (0) to stop visiting cookies. This function may never be
   // called if no cookies are found.
   ///
-  int(CEF_CALLBACK* visit)(struct _cef_cookie_visitor_t* self,
-                           const struct _cef_cookie_t* cookie,
-                           int count,
-                           int total,
-                           int* deleteCookie);
+  int (CEF_CALLBACK *visit)(struct _cef_cookie_visitor_t* self,
+      const struct _cef_cookie_t* cookie, int count, int total,
+      int* deleteCookie);
 } cef_cookie_visitor_t;
 
-///
-// Structure to implement to be notified of asynchronous completion via
-// cef_cookie_manager_t::set_cookie().
-///
-typedef struct _cef_set_cookie_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Method that will be called upon completion. |success| will be true (1) if
-  // the cookie was set successfully.
-  ///
-  void(CEF_CALLBACK* on_complete)(struct _cef_set_cookie_callback_t* self,
-                                  int success);
-} cef_set_cookie_callback_t;
-
-///
-// Structure to implement to be notified of asynchronous completion via
-// cef_cookie_manager_t::delete_cookies().
-///
-typedef struct _cef_delete_cookies_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Method that will be called upon completion. |num_deleted| will be the
-  // number of cookies that were deleted.
-  ///
-  void(CEF_CALLBACK* on_complete)(struct _cef_delete_cookies_callback_t* self,
-                                  int num_deleted);
-} cef_delete_cookies_callback_t;
 
 #ifdef __cplusplus
 }

include/capi/cef_crash_util_capi.h

@@ -1,151 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=5d111a67218403f78737f2c4dc92d2fd96dc125d$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Crash reporting is configured using an INI-style config file named
-// "crash_reporter.cfg". On Windows and Linux this file must be placed next to
-// the main application executable. On macOS this file must be placed in the
-// top-level app bundle Resources directory (e.g.
-// "<appname>.app/Contents/Resources"). File contents are as follows:
-//
-//  # Comments start with a hash character and must be on their own line.
-//
-//  [Config]
-//  ProductName=<Value of the "prod" crash key; defaults to "cef">
-//  ProductVersion=<Value of the "ver" crash key; defaults to the CEF version>
-//  AppName=<Windows only; App-specific folder name component for storing crash
-//           information; default to "CEF">
-//  ExternalHandler=<Windows only; Name of the external handler exe to use
-//                   instead of re-launching the main exe; default to empty>
-//  BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes
-//                                 should be forwarded to the system crash
-//                                 reporter; default to false>
-//  ServerURL=<crash server URL; default to empty>
-//  RateLimitEnabled=<True if uploads should be rate limited; default to true>
-//  MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled;
-//                    default to 5>
-//  MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value
-//                       will cause older reports to be deleted; default to 20>
-//  MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted;
-//                        default to 5>
-//
-//  [CrashKeys]
-//  my_key1=<small|medium|large>
-//  my_key2=<small|medium|large>
-//
-// Config section:
-//
-// If "ProductName" and/or "ProductVersion" are set then the specified values
-// will be included in the crash dump metadata. On macOS if these values are set
-// to NULL then they will be retrieved from the Info.plist file using the
-// "CFBundleName" and "CFBundleShortVersionString" keys respectively.
-//
-// If "AppName" is set on Windows then crash report information (metrics,
-// database and dumps) will be stored locally on disk under the
-// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other
-// platforms the CefSettings.user_data_path value will be used.
-//
-// If "ExternalHandler" is set on Windows then the specified exe will be
-// launched as the crashpad-handler instead of re-launching the main process
-// exe. The value can be an absolute path or a path relative to the main exe
-// directory. On Linux the CefSettings.browser_subprocess_path value will be
-// used. On macOS the existing subprocess app bundle will be used.
-//
-// If "BrowserCrashForwardingEnabled" is set to true (1) on macOS then browser
-// process crashes will be forwarded to the system crash reporter. This results
-// in the crash UI dialog being displayed to the user and crash reports being
-// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports
-// from non-browser processes and Debug builds is always disabled.
-//
-// If "ServerURL" is set then crashes will be uploaded as a multi-part POST
-// request to the specified URL. Otherwise, reports will only be stored locally
-// on disk.
-//
-// If "RateLimitEnabled" is set to true (1) then crash report uploads will be
-// rate limited as follows:
-//  1. If "MaxUploadsPerDay" is set to a positive value then at most the
-//     specified number of crashes will be uploaded in each 24 hour period.
-//  2. If crash upload fails due to a network or server error then an
-//     incremental backoff delay up to a maximum of 24 hours will be applied for
-//     retries.
-//  3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the
-//     "MaxUploadsPerDay" value will be reduced to 1 until the client is
-//     restarted. This helps to avoid an upload flood when the network or
-//     server error is resolved.
-// Rate limiting is not supported on Linux.
-//
-// If "MaxDatabaseSizeInMb" is set to a positive value then crash report storage
-// on disk will be limited to that size in megabytes. For example, on Windows
-// each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20 equates to
-// about 34 crash reports stored on disk. Not supported on Linux.
-//
-// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports older
-// than the specified age in days will be deleted. Not supported on Linux.
-//
-// CrashKeys section:
-//
-// A maximum of 26 crash keys of each size can be specified for use by the
-// application. Crash key values will be truncated based on the specified size
-// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
-// crash keys can be set from any thread or process using the
-// CefSetCrashKeyValue function. These key/value pairs will be sent to the crash
-// server along with the crash dump file.
-///
-CEF_EXPORT int cef_crash_reporting_enabled(void);
-
-///
-// Sets or clears a specific key-value pair from the crash metadata.
-///
-CEF_EXPORT void cef_set_crash_key_value(const cef_string_t* key,
-                                        const cef_string_t* value);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_CRASH_UTIL_CAPI_H_

include/capi/cef_devtools_message_observer_capi.h

@@ -1,147 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=ec62239c2b24ff512b64ca758be825ff57fb3b6b$
-//
-
-#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_

include/capi/cef_dialog_handler_capi.h

@@ -1,116 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=0f56154217707d141912dc8a298279df8df04311$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Callback structure for asynchronous continuation of file dialog requests.
-///
-typedef struct _cef_file_dialog_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Continue the file selection. |selected_accept_filter| should be the 0-based
-  // index of the value selected from the accept filters array passed to
-  // cef_dialog_handler_t::OnFileDialog. |file_paths| should be a single value
-  // or a list of values depending on the dialog mode. An NULL |file_paths|
-  // value is treated the same as calling cancel().
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_file_dialog_callback_t* self,
-                           int selected_accept_filter,
-                           cef_string_list_t file_paths);
-
-  ///
-  // Cancel the file selection.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_file_dialog_callback_t* self);
-} cef_file_dialog_callback_t;
-
-///
-// Implement this structure to handle dialog events. The functions of this
-// structure will be called on the browser process UI thread.
-///
-typedef struct _cef_dialog_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called to run a file chooser dialog. |mode| represents the type of dialog
-  // to display. |title| to the title to be used for the dialog and may be NULL
-  // to show the default title ("Open" or "Save" depending on the mode).
-  // |default_file_path| is the path with optional directory and/or file name
-  // component that should be initially selected in the dialog. |accept_filters|
-  // are used to restrict the selectable file types and may any combination of
-  // (a) valid lower-cased MIME types (e.g. "text/*" or "image/*"), (b)
-  // individual file extensions (e.g. ".txt" or ".png"), or (c) combined
-  // description and file extension delimited using "|" and ";" (e.g. "Image
-  // Types|.png;.gif;.jpg"). |selected_accept_filter| is the 0-based index of
-  // the filter that should be selected by default. To display a custom dialog
-  // return true (1) and execute |callback| either inline or at a later time. To
-  // display the default dialog return false (0).
-  ///
-  int(CEF_CALLBACK* on_file_dialog)(
-      struct _cef_dialog_handler_t* self,
-      struct _cef_browser_t* browser,
-      cef_file_dialog_mode_t mode,
-      const cef_string_t* title,
-      const cef_string_t* default_file_path,
-      cef_string_list_t accept_filters,
-      int selected_accept_filter,
-      struct _cef_file_dialog_callback_t* callback);
-} cef_dialog_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_

include/capi/cef_display_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,21 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=142637539a094a03adc71d2f3f5b711ba64918b1$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_frame_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to handle events related to browser display state.
 // The functions of this structure will be called on the UI thread.
@@ -56,106 +53,63 @@ typedef struct _cef_display_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
+
+  ///
+  // Called when the navigation state has changed.
+  ///
+  void (CEF_CALLBACK *on_nav_state_change)(struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser, int canGoBack, int canGoForward);
 
   ///
   // Called when a frame's address has changed.
   ///
-  void(CEF_CALLBACK* on_address_change)(struct _cef_display_handler_t* self,
-                                        struct _cef_browser_t* browser,
-                                        struct _cef_frame_t* frame,
-                                        const cef_string_t* url);
+  void (CEF_CALLBACK *on_address_change)(struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      const cef_string_t* url);
+
+  ///
+  // Called when the size of the content area has changed.
+  ///
+  void (CEF_CALLBACK *on_contents_size_change)(
+      struct _cef_display_handler_t* self, struct _cef_browser_t* browser,
+      struct _cef_frame_t* frame, int width, int height);
 
   ///
   // Called when the page title changes.
   ///
-  void(CEF_CALLBACK* on_title_change)(struct _cef_display_handler_t* self,
-                                      struct _cef_browser_t* browser,
-                                      const cef_string_t* title);
-
-  ///
-  // Called when the page icon changes.
-  ///
-  void(CEF_CALLBACK* on_favicon_urlchange)(struct _cef_display_handler_t* self,
-                                           struct _cef_browser_t* browser,
-                                           cef_string_list_t icon_urls);
-
-  ///
-  // Called when web content in the page has toggled fullscreen mode. If
-  // |fullscreen| is true (1) the content will automatically be sized to fill
-  // the browser content area. If |fullscreen| is false (0) the content will
-  // automatically return to its original size and position. The client is
-  // responsible for resizing the browser if desired.
-  ///
-  void(CEF_CALLBACK* on_fullscreen_mode_change)(
-      struct _cef_display_handler_t* self,
-      struct _cef_browser_t* browser,
-      int fullscreen);
+  void (CEF_CALLBACK *on_title_change)(struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser, const cef_string_t* title);
 
   ///
   // Called when the browser is about to display a tooltip. |text| contains the
   // text that will be displayed in the tooltip. To handle the display of the
   // tooltip yourself return true (1). Otherwise, you can optionally modify
   // |text| and then return false (0) to allow the browser to display the
-  // tooltip. When window rendering is disabled the application is responsible
-  // for drawing tooltips and the return value is ignored.
+  // tooltip.
   ///
-  int(CEF_CALLBACK* on_tooltip)(struct _cef_display_handler_t* self,
-                                struct _cef_browser_t* browser,
-                                cef_string_t* text);
+  int (CEF_CALLBACK *on_tooltip)(struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser, cef_string_t* text);
 
   ///
-  // Called when the browser receives a status message. |value| contains the
-  // text that will be displayed in the status message.
+  // Called when the browser receives a status message. |text| contains the text
+  // that will be displayed in the status message and |type| indicates the
+  // status message type.
   ///
-  void(CEF_CALLBACK* on_status_message)(struct _cef_display_handler_t* self,
-                                        struct _cef_browser_t* browser,
-                                        const cef_string_t* value);
+  void (CEF_CALLBACK *on_status_message)(struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser, const cef_string_t* value,
+      enum cef_handler_statustype_t type);
 
   ///
   // Called to display a console message. Return true (1) to stop the message
   // from being output to the console.
   ///
-  int(CEF_CALLBACK* on_console_message)(struct _cef_display_handler_t* self,
-                                        struct _cef_browser_t* browser,
-                                        cef_log_severity_t level,
-                                        const cef_string_t* message,
-                                        const cef_string_t* source,
-                                        int line);
-
-  ///
-  // Called when auto-resize is enabled via
-  // cef_browser_host_t::SetAutoResizeEnabled and the contents have auto-
-  // resized. |new_size| will be the desired size in view coordinates. Return
-  // true (1) if the resize was handled or false (0) for default handling.
-  ///
-  int(CEF_CALLBACK* on_auto_resize)(struct _cef_display_handler_t* self,
-                                    struct _cef_browser_t* browser,
-                                    const cef_size_t* new_size);
-
-  ///
-  // Called when the overall page loading progress has changed. |progress|
-  // ranges from 0.0 to 1.0.
-  ///
-  void(CEF_CALLBACK* on_loading_progress_change)(
-      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);
+  int (CEF_CALLBACK *on_console_message)(struct _cef_display_handler_t* self,
+      struct _cef_browser_t* browser, const cef_string_t* message,
+      const cef_string_t* source, int line);
 } cef_display_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_dom_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,31 +33,27 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c6de3fb4d64a2b2ad06a4b9c5e9d7625d40b5bb6$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _cef_domdocument_t;
-struct _cef_domnode_t;
+#include "include/capi/cef_base_capi.h"
+
 
 ///
 // Structure to implement for visiting the DOM. The functions of this structure
-// will be called on the render process main thread.
+// will be called on the UI thread.
 ///
 typedef struct _cef_domvisitor_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
   // Method executed for visiting the DOM. The document object passed to this
@@ -66,99 +62,111 @@ typedef struct _cef_domvisitor_t {
   // keep references to or attempt to access any DOM objects outside the scope
   // of this function.
   ///
-  void(CEF_CALLBACK* visit)(struct _cef_domvisitor_t* self,
-                            struct _cef_domdocument_t* document);
+  void (CEF_CALLBACK *visit)(struct _cef_domvisitor_t* self,
+      struct _cef_domdocument_t* document);
 } cef_domvisitor_t;
 
+
 ///
 // Structure used to represent a DOM document. The functions of this structure
-// should only be called on the render process main thread thread.
+// should only be called on the UI thread.
 ///
 typedef struct _cef_domdocument_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
   // Returns the document type.
   ///
-  cef_dom_document_type_t(CEF_CALLBACK* get_type)(
+  enum cef_dom_document_type_t (CEF_CALLBACK *get_type)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the root document node.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_document)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_document)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the BODY node of an HTML document.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_body)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_body)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the HEAD node of an HTML document.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_head)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_head)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the title of an HTML document.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_title)(
+  cef_string_userfree_t (CEF_CALLBACK *get_title)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the document element with the specified ID value.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_element_by_id)(
-      struct _cef_domdocument_t* self,
-      const cef_string_t* id);
+  struct _cef_domnode_t* (CEF_CALLBACK *get_element_by_id)(
+      struct _cef_domdocument_t* self, const cef_string_t* id);
 
   ///
   // Returns the node that currently has keyboard focus.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_focused_node)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_focused_node)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns true (1) if a portion of the document is selected.
   ///
-  int(CEF_CALLBACK* has_selection)(struct _cef_domdocument_t* self);
+  int (CEF_CALLBACK *has_selection)(struct _cef_domdocument_t* self);
+
+  ///
+  // Returns the selection start node.
+  ///
+  struct _cef_domnode_t* (CEF_CALLBACK *get_selection_start_node)(
+      struct _cef_domdocument_t* self);
 
   ///
   // Returns the selection offset within the start node.
   ///
-  int(CEF_CALLBACK* get_selection_start_offset)(
+  int (CEF_CALLBACK *get_selection_start_offset)(
+      struct _cef_domdocument_t* self);
+
+  ///
+  // Returns the selection end node.
+  ///
+  struct _cef_domnode_t* (CEF_CALLBACK *get_selection_end_node)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the selection offset within the end node.
   ///
-  int(CEF_CALLBACK* get_selection_end_offset)(struct _cef_domdocument_t* self);
+  int (CEF_CALLBACK *get_selection_end_offset)(struct _cef_domdocument_t* self);
 
   ///
   // Returns the contents of this selection as markup.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_selection_as_markup)(
+  cef_string_userfree_t (CEF_CALLBACK *get_selection_as_markup)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the contents of this selection as text.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_selection_as_text)(
+  cef_string_userfree_t (CEF_CALLBACK *get_selection_as_text)(
       struct _cef_domdocument_t* self);
 
   ///
   // Returns the base URL for the document.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_base_url)(
+  cef_string_userfree_t (CEF_CALLBACK *get_base_url)(
       struct _cef_domdocument_t* self);
 
   ///
@@ -166,179 +174,265 @@ typedef struct _cef_domdocument_t {
   // partial URL.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_complete_url)(
-      struct _cef_domdocument_t* self,
-      const cef_string_t* partialURL);
+  cef_string_userfree_t (CEF_CALLBACK *get_complete_url)(
+      struct _cef_domdocument_t* self, const cef_string_t* partialURL);
 } cef_domdocument_t;
 
+
 ///
 // Structure used to represent a DOM node. The functions of this structure
-// should only be called on the render process main thread.
+// should only be called on the UI thread.
 ///
 typedef struct _cef_domnode_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
   // Returns the type for this node.
   ///
-  cef_dom_node_type_t(CEF_CALLBACK* get_type)(struct _cef_domnode_t* self);
+  enum cef_dom_node_type_t (CEF_CALLBACK *get_type)(
+      struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this is a text node.
   ///
-  int(CEF_CALLBACK* is_text)(struct _cef_domnode_t* self);
+  int (CEF_CALLBACK *is_text)(struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this is an element node.
   ///
-  int(CEF_CALLBACK* is_element)(struct _cef_domnode_t* self);
-
-  ///
-  // Returns true (1) if this is an editable node.
-  ///
-  int(CEF_CALLBACK* is_editable)(struct _cef_domnode_t* self);
+  int (CEF_CALLBACK *is_element)(struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this is a form control element node.
   ///
-  int(CEF_CALLBACK* is_form_control_element)(struct _cef_domnode_t* self);
+  int (CEF_CALLBACK *is_form_control_element)(struct _cef_domnode_t* self);
 
   ///
   // Returns the type of this form control element node.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_form_control_element_type)(
+  cef_string_userfree_t (CEF_CALLBACK *get_form_control_element_type)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this object is pointing to the same handle as |that|
   // object.
   ///
-  int(CEF_CALLBACK* is_same)(struct _cef_domnode_t* self,
-                             struct _cef_domnode_t* that);
+  int (CEF_CALLBACK *is_same)(struct _cef_domnode_t* self,
+      struct _cef_domnode_t* that);
 
   ///
   // Returns the name of this node.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_domnode_t* self);
+  cef_string_userfree_t (CEF_CALLBACK *get_name)(struct _cef_domnode_t* self);
 
   ///
   // Returns the value of this node.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_value)(struct _cef_domnode_t* self);
+  cef_string_userfree_t (CEF_CALLBACK *get_value)(struct _cef_domnode_t* self);
 
   ///
   // Set the value of this node. Returns true (1) on success.
   ///
-  int(CEF_CALLBACK* set_value)(struct _cef_domnode_t* self,
-                               const cef_string_t* value);
+  int (CEF_CALLBACK *set_value)(struct _cef_domnode_t* self,
+      const cef_string_t* value);
 
   ///
   // Returns the contents of this node as markup.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_as_markup)(
+  cef_string_userfree_t (CEF_CALLBACK *get_as_markup)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns the document associated with this node.
   ///
-  struct _cef_domdocument_t*(CEF_CALLBACK* get_document)(
+  struct _cef_domdocument_t* (CEF_CALLBACK *get_document)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns the parent node.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_parent)(struct _cef_domnode_t* self);
+  struct _cef_domnode_t* (CEF_CALLBACK *get_parent)(
+      struct _cef_domnode_t* self);
 
   ///
   // Returns the previous sibling node.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_previous_sibling)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_previous_sibling)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns the next sibling node.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_next_sibling)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_next_sibling)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this node has child nodes.
   ///
-  int(CEF_CALLBACK* has_children)(struct _cef_domnode_t* self);
+  int (CEF_CALLBACK *has_children)(struct _cef_domnode_t* self);
 
   ///
   // Return the first child node.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_first_child)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_first_child)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns the last child node.
   ///
-  struct _cef_domnode_t*(CEF_CALLBACK* get_last_child)(
+  struct _cef_domnode_t* (CEF_CALLBACK *get_last_child)(
       struct _cef_domnode_t* self);
 
+  ///
+  // Add an event listener to this node for the specified event type. If
+  // |useCapture| is true (1) then this listener will be considered a capturing
+  // listener. Capturing listeners will recieve all events of the specified type
+  // before the events are dispatched to any other event targets beneath the
+  // current node in the tree. Events which are bubbling upwards through the
+  // tree will not trigger a capturing listener. Separate calls to this function
+  // can be used to register the same listener with and without capture. See
+  // WebCore/dom/EventNames.h for the list of supported event types.
+  ///
+  void (CEF_CALLBACK *add_event_listener)(struct _cef_domnode_t* self,
+      const cef_string_t* eventType, struct _cef_domevent_listener_t* listener,
+      int useCapture);
+
+
   // The following functions are valid only for element nodes.
 
   ///
   // Returns the tag name of this element.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_element_tag_name)(
+  cef_string_userfree_t (CEF_CALLBACK *get_element_tag_name)(
       struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this element has attributes.
   ///
-  int(CEF_CALLBACK* has_element_attributes)(struct _cef_domnode_t* self);
+  int (CEF_CALLBACK *has_element_attributes)(struct _cef_domnode_t* self);
 
   ///
   // Returns true (1) if this element has an attribute named |attrName|.
   ///
-  int(CEF_CALLBACK* has_element_attribute)(struct _cef_domnode_t* self,
-                                           const cef_string_t* attrName);
+  int (CEF_CALLBACK *has_element_attribute)(struct _cef_domnode_t* self,
+      const cef_string_t* attrName);
 
   ///
   // Returns the element attribute named |attrName|.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_element_attribute)(
-      struct _cef_domnode_t* self,
-      const cef_string_t* attrName);
+  cef_string_userfree_t (CEF_CALLBACK *get_element_attribute)(
+      struct _cef_domnode_t* self, const cef_string_t* attrName);
 
   ///
   // Returns a map of all element attributes.
   ///
-  void(CEF_CALLBACK* get_element_attributes)(struct _cef_domnode_t* self,
-                                             cef_string_map_t attrMap);
+  void (CEF_CALLBACK *get_element_attributes)(struct _cef_domnode_t* self,
+      cef_string_map_t attrMap);
 
   ///
   // Set the value for the element attribute named |attrName|. Returns true (1)
   // on success.
   ///
-  int(CEF_CALLBACK* set_element_attribute)(struct _cef_domnode_t* self,
-                                           const cef_string_t* attrName,
-                                           const cef_string_t* value);
+  int (CEF_CALLBACK *set_element_attribute)(struct _cef_domnode_t* self,
+      const cef_string_t* attrName, const cef_string_t* value);
 
   ///
   // Returns the inner text of the element.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_element_inner_text)(
+  cef_string_userfree_t (CEF_CALLBACK *get_element_inner_text)(
       struct _cef_domnode_t* self);
+} cef_domnode_t;
+
+
+///
+// Structure used to represent a DOM event. The functions of this structure
+// should only be called on the UI thread.
+///
+typedef struct _cef_domevent_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
 
   ///
-  // Returns the bounds of the element.
+  // Returns the event type.
   ///
-  cef_rect_t(CEF_CALLBACK* get_element_bounds)(struct _cef_domnode_t* self);
-} cef_domnode_t;
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_type)(struct _cef_domevent_t* self);
+
+  ///
+  // Returns the event category.
+  ///
+  enum cef_dom_event_category_t (CEF_CALLBACK *get_category)(
+      struct _cef_domevent_t* self);
+
+  ///
+  // Returns the event processing phase.
+  ///
+  enum cef_dom_event_phase_t (CEF_CALLBACK *get_phase)(
+      struct _cef_domevent_t* self);
+
+  ///
+  // Returns true (1) if the event can bubble up the tree.
+  ///
+  int (CEF_CALLBACK *can_bubble)(struct _cef_domevent_t* self);
+
+  ///
+  // Returns true (1) if the event can be canceled.
+  ///
+  int (CEF_CALLBACK *can_cancel)(struct _cef_domevent_t* self);
+
+  ///
+  // Returns the document associated with this event.
+  ///
+  struct _cef_domdocument_t* (CEF_CALLBACK *get_document)(
+      struct _cef_domevent_t* self);
+
+  ///
+  // Returns the target of the event.
+  ///
+  struct _cef_domnode_t* (CEF_CALLBACK *get_target)(
+      struct _cef_domevent_t* self);
+
+  ///
+  // Returns the current target of the event.
+  ///
+  struct _cef_domnode_t* (CEF_CALLBACK *get_current_target)(
+      struct _cef_domevent_t* self);
+} cef_domevent_t;
+
+
+///
+// Structure to implement for handling DOM events. The functions of this
+// structure will be called on the UI thread.
+///
+typedef struct _cef_domevent_listener_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Called when an event is received. The event object passed to this function
+  // contains a snapshot of the DOM at the time this function is executed. DOM
+  // objects are only valid for the scope of this function. Do not keep
+  // references to or attempt to access any DOM objects outside the scope of
+  // this function.
+  ///
+  void (CEF_CALLBACK *handle_event)(struct _cef_domevent_listener_t* self,
+      struct _cef_domevent_t* event);
+} cef_domevent_listener_t;
+
 
 #ifdef __cplusplus
 }

include/capi/cef_download_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,104 +33,43 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=ec13ec3e2819e4ac49792c3a1c57bc60b45fb95b$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_download_item_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-///
-// Callback structure used to asynchronously continue a download.
-///
-typedef struct _cef_before_download_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
+#include "include/capi/cef_base_capi.h"
 
-  ///
-  // Call to continue the download. Set |download_path| to the full file path
-  // for the download including the file name or leave blank to use the
-  // suggested name and the default temp directory. Set |show_dialog| to true
-  // (1) if you do wish to show the default "Save As" dialog.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_before_download_callback_t* self,
-                           const cef_string_t* download_path,
-                           int show_dialog);
-} cef_before_download_callback_t;
-
-///
-// Callback structure used to asynchronously cancel a download.
-///
-typedef struct _cef_download_item_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Call to cancel the download.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_download_item_callback_t* self);
-
-  ///
-  // Call to pause the download.
-  ///
-  void(CEF_CALLBACK* pause)(struct _cef_download_item_callback_t* self);
-
-  ///
-  // Call to resume the download.
-  ///
-  void(CEF_CALLBACK* resume)(struct _cef_download_item_callback_t* self);
-} cef_download_item_callback_t;
 
 ///
 // Structure used to handle file downloads. The functions of this structure will
-// called on the browser process UI thread.
+// always be called on the UI thread.
 ///
 typedef struct _cef_download_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called before a download begins. |suggested_name| is the suggested name for
-  // the download file. By default the download will be canceled. Execute
-  // |callback| either asynchronously or in this function to continue the
-  // download if desired. Do not keep a reference to |download_item| outside of
-  // this function.
+  // A portion of the file contents have been received. This function will be
+  // called multiple times until the download is complete. Return |true (1)| to
+  // continue receiving data and |false (0)| to cancel.
   ///
-  void(CEF_CALLBACK* on_before_download)(
-      struct _cef_download_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_download_item_t* download_item,
-      const cef_string_t* suggested_name,
-      struct _cef_before_download_callback_t* callback);
+  int (CEF_CALLBACK *received_data)(struct _cef_download_handler_t* self,
+      void* data, int data_size);
 
   ///
-  // Called when a download's status or progress information has been updated.
-  // This may be called multiple times before and after on_before_download().
-  // Execute |callback| either asynchronously or in this function to cancel the
-  // download if desired. Do not keep a reference to |download_item| outside of
-  // this function.
+  // The download is complete.
   ///
-  void(CEF_CALLBACK* on_download_updated)(
-      struct _cef_download_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_download_item_t* download_item,
-      struct _cef_download_item_callback_t* callback);
+  void (CEF_CALLBACK *complete)(struct _cef_download_handler_t* self);
 } cef_download_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_download_item_capi.h

@@ -1,162 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=b9f0d91dd2fdb3625365ff8b332b08e1f0ea1187$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Structure used to represent a download item.
-///
-typedef struct _cef_download_item_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this object is valid. Do not call any other functions
-  // if this function returns false (0).
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns true (1) if the download is in progress.
-  ///
-  int(CEF_CALLBACK* is_in_progress)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns true (1) if the download is complete.
-  ///
-  int(CEF_CALLBACK* is_complete)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns true (1) if the download has been canceled or interrupted.
-  ///
-  int(CEF_CALLBACK* is_canceled)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns a simple speed estimate in bytes/s.
-  ///
-  int64(CEF_CALLBACK* get_current_speed)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the rough percent complete or -1 if the receive total size is
-  // unknown.
-  ///
-  int(CEF_CALLBACK* get_percent_complete)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the total number of bytes.
-  ///
-  int64(CEF_CALLBACK* get_total_bytes)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the number of received bytes.
-  ///
-  int64(CEF_CALLBACK* get_received_bytes)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the time that the download started.
-  ///
-  cef_time_t(CEF_CALLBACK* get_start_time)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the time that the download ended.
-  ///
-  cef_time_t(CEF_CALLBACK* get_end_time)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the full path to the downloaded or downloading file.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_full_path)(
-      struct _cef_download_item_t* self);
-
-  ///
-  // Returns the unique identifier for this download.
-  ///
-  uint32(CEF_CALLBACK* get_id)(struct _cef_download_item_t* self);
-
-  ///
-  // Returns the URL.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_url)(
-      struct _cef_download_item_t* self);
-
-  ///
-  // Returns the original URL before any redirections.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_original_url)(
-      struct _cef_download_item_t* self);
-
-  ///
-  // Returns the suggested file name.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_suggested_file_name)(
-      struct _cef_download_item_t* self);
-
-  ///
-  // Returns the content disposition.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_content_disposition)(
-      struct _cef_download_item_t* self);
-
-  ///
-  // Returns the mime type.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_mime_type)(
-      struct _cef_download_item_t* self);
-} cef_download_item_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_

include/capi/cef_drag_data_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,21 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=221973f3d5728478eeb0f8f5f55ca5e68b3afd8a$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_image_capi.h"
-#include "include/capi/cef_stream_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Structure used to represent drag data. The functions of this structure may be
 // called on any thread.
@@ -56,66 +53,56 @@ typedef struct _cef_drag_data_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns a copy of the current object.
-  ///
-  struct _cef_drag_data_t*(CEF_CALLBACK* clone)(struct _cef_drag_data_t* self);
-
-  ///
-  // Returns true (1) if this object is read-only.
-  ///
-  int(CEF_CALLBACK* is_read_only)(struct _cef_drag_data_t* self);
+  cef_base_t base;
 
   ///
   // Returns true (1) if the drag data is a link.
   ///
-  int(CEF_CALLBACK* is_link)(struct _cef_drag_data_t* self);
+  int (CEF_CALLBACK *is_link)(struct _cef_drag_data_t* self);
 
   ///
   // Returns true (1) if the drag data is a text or html fragment.
   ///
-  int(CEF_CALLBACK* is_fragment)(struct _cef_drag_data_t* self);
+  int (CEF_CALLBACK *is_fragment)(struct _cef_drag_data_t* self);
 
   ///
   // Returns true (1) if the drag data is a file.
   ///
-  int(CEF_CALLBACK* is_file)(struct _cef_drag_data_t* self);
+  int (CEF_CALLBACK *is_file)(struct _cef_drag_data_t* self);
 
   ///
   // Return the link URL that is being dragged.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_link_url)(
+  cef_string_userfree_t (CEF_CALLBACK *get_link_url)(
       struct _cef_drag_data_t* self);
 
   ///
   // Return the title associated with the link being dragged.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_link_title)(
+  cef_string_userfree_t (CEF_CALLBACK *get_link_title)(
       struct _cef_drag_data_t* self);
 
   ///
   // Return the metadata, if any, associated with the link being dragged.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_link_metadata)(
+  cef_string_userfree_t (CEF_CALLBACK *get_link_metadata)(
       struct _cef_drag_data_t* self);
 
   ///
   // Return the plain text fragment that is being dragged.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_fragment_text)(
+  cef_string_userfree_t (CEF_CALLBACK *get_fragment_text)(
       struct _cef_drag_data_t* self);
 
   ///
   // Return the text/html fragment that is being dragged.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_fragment_html)(
+  cef_string_userfree_t (CEF_CALLBACK *get_fragment_html)(
       struct _cef_drag_data_t* self);
 
   ///
@@ -123,103 +110,31 @@ typedef struct _cef_drag_data_t {
   // resolving relative URLs and may be NULL.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_fragment_base_url)(
+  cef_string_userfree_t (CEF_CALLBACK *get_fragment_base_url)(
+      struct _cef_drag_data_t* self);
+
+  ///
+  // Return the extension of the file being dragged out of the browser window.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_file_extension)(
       struct _cef_drag_data_t* self);
 
   ///
   // Return the name of the file being dragged out of the browser window.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_file_name)(
+  cef_string_userfree_t (CEF_CALLBACK *get_file_name)(
       struct _cef_drag_data_t* self);
 
-  ///
-  // Write the contents of the file being dragged out of the web view into
-  // |writer|. Returns the number of bytes sent to |writer|. If |writer| is NULL
-  // this function will return the size of the file contents in bytes. Call
-  // get_file_name() to get a suggested name for the file.
-  ///
-  size_t(CEF_CALLBACK* get_file_contents)(struct _cef_drag_data_t* self,
-                                          struct _cef_stream_writer_t* writer);
-
   ///
   // Retrieve the list of file names that are being dragged into the browser
   // window.
   ///
-  int(CEF_CALLBACK* get_file_names)(struct _cef_drag_data_t* self,
-                                    cef_string_list_t names);
-
-  ///
-  // Set the link URL that is being dragged.
-  ///
-  void(CEF_CALLBACK* set_link_url)(struct _cef_drag_data_t* self,
-                                   const cef_string_t* url);
-
-  ///
-  // Set the title associated with the link being dragged.
-  ///
-  void(CEF_CALLBACK* set_link_title)(struct _cef_drag_data_t* self,
-                                     const cef_string_t* title);
-
-  ///
-  // Set the metadata associated with the link being dragged.
-  ///
-  void(CEF_CALLBACK* set_link_metadata)(struct _cef_drag_data_t* self,
-                                        const cef_string_t* data);
-
-  ///
-  // Set the plain text fragment that is being dragged.
-  ///
-  void(CEF_CALLBACK* set_fragment_text)(struct _cef_drag_data_t* self,
-                                        const cef_string_t* text);
-
-  ///
-  // Set the text/html fragment that is being dragged.
-  ///
-  void(CEF_CALLBACK* set_fragment_html)(struct _cef_drag_data_t* self,
-                                        const cef_string_t* html);
-
-  ///
-  // Set the base URL that the fragment came from.
-  ///
-  void(CEF_CALLBACK* set_fragment_base_url)(struct _cef_drag_data_t* self,
-                                            const cef_string_t* base_url);
-
-  ///
-  // Reset the file contents. You should do this before calling
-  // cef_browser_host_t::DragTargetDragEnter as the web view does not allow us
-  // to drag in this kind of data.
-  ///
-  void(CEF_CALLBACK* reset_file_contents)(struct _cef_drag_data_t* self);
-
-  ///
-  // Add a file that is being dragged into the webview.
-  ///
-  void(CEF_CALLBACK* add_file)(struct _cef_drag_data_t* self,
-                               const cef_string_t* path,
-                               const cef_string_t* display_name);
-
-  ///
-  // Get the image representation of drag data. May return NULL if no image
-  // representation is available.
-  ///
-  struct _cef_image_t*(CEF_CALLBACK* get_image)(struct _cef_drag_data_t* self);
-
-  ///
-  // Get the image hotspot (drag start location relative to image dimensions).
-  ///
-  cef_point_t(CEF_CALLBACK* get_image_hotspot)(struct _cef_drag_data_t* self);
-
-  ///
-  // Returns true (1) if an image representation of drag data is available.
-  ///
-  int(CEF_CALLBACK* has_image)(struct _cef_drag_data_t* self);
+  int (CEF_CALLBACK *get_file_names)(struct _cef_drag_data_t* self,
+      cef_string_list_t names);
 } cef_drag_data_t;
 
-///
-// Create a new cef_drag_data_t object.
-///
-CEF_EXPORT cef_drag_data_t* cef_drag_data_create(void);
 
 #ifdef __cplusplus
 }

include/capi/cef_drag_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,22 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=5b2051c42c1d4c41b85ca823d34b26bfa5de6777$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_drag_data_capi.h"
-#include "include/capi/cef_frame_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to handle events related to dragging. The functions
 // of this structure will be called on the UI thread.
@@ -57,7 +53,17 @@ typedef struct _cef_drag_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
+
+  ///
+  // Called when the browser window initiates a drag event. |dragData| contains
+  // the drag event data and |mask| represents the type of drag operation.
+  // Return false (0) for default drag handling behavior or true (1) to cancel
+  // the drag event.
+  ///
+  int (CEF_CALLBACK *on_drag_start)(struct _cef_drag_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_drag_data_t* dragData,
+      enum cef_drag_operations_mask_t mask);
 
   ///
   // Called when an external drag event enters the browser window. |dragData|
@@ -65,26 +71,12 @@ typedef struct _cef_drag_handler_t {
   // operation. Return false (0) for default drag handling behavior or true (1)
   // to cancel the drag event.
   ///
-  int(CEF_CALLBACK* on_drag_enter)(struct _cef_drag_handler_t* self,
-                                   struct _cef_browser_t* browser,
-                                   struct _cef_drag_data_t* dragData,
-                                   cef_drag_operations_mask_t mask);
-
-  ///
-  // Called whenever draggable regions for the browser window change. These can
-  // be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If
-  // draggable regions are never defined in a document this function will also
-  // never be called. If the last draggable region is removed from a document
-  // this function will be called with an NULL vector.
-  ///
-  void(CEF_CALLBACK* on_draggable_regions_changed)(
-      struct _cef_drag_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      size_t regionsCount,
-      cef_draggable_region_t const* regions);
+  int (CEF_CALLBACK *on_drag_enter)(struct _cef_drag_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_drag_data_t* dragData,
+      enum cef_drag_operations_mask_t mask);
 } cef_drag_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_extension_capi.h

@@ -1,130 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=fcfe34c1517ebdb3f00c1f737b91361e771b820d$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_values_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_extension_handler_t;
-struct _cef_request_context_t;
-
-///
-// Object representing an extension. Methods may be called on any thread unless
-// otherwise indicated.
-///
-typedef struct _cef_extension_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns the unique extension identifier. This is calculated based on the
-  // extension public key, if available, or on the extension path. See
-  // https://developer.chrome.com/extensions/manifest/key for details.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_identifier)(
-      struct _cef_extension_t* self);
-
-  ///
-  // Returns the absolute path to the extension directory on disk. This value
-  // will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
-  // cef_request_context_t::LoadExtension.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_path)(struct _cef_extension_t* self);
-
-  ///
-  // Returns the extension manifest contents as a cef_dictionary_value_t object.
-  // See https://developer.chrome.com/extensions/manifest for details.
-  ///
-  struct _cef_dictionary_value_t*(CEF_CALLBACK* get_manifest)(
-      struct _cef_extension_t* self);
-
-  ///
-  // Returns true (1) if this object is the same extension as |that| object.
-  // Extensions are considered the same if identifier, path and loader context
-  // match.
-  ///
-  int(CEF_CALLBACK* is_same)(struct _cef_extension_t* self,
-                             struct _cef_extension_t* that);
-
-  ///
-  // Returns the handler for this extension. Will return NULL for internal
-  // extensions or if no handler was passed to
-  // cef_request_context_t::LoadExtension.
-  ///
-  struct _cef_extension_handler_t*(CEF_CALLBACK* get_handler)(
-      struct _cef_extension_t* self);
-
-  ///
-  // Returns the request context that loaded this extension. Will return NULL
-  // for internal extensions or if the extension has been unloaded. See the
-  // cef_request_context_t::LoadExtension documentation for more information
-  // about loader contexts. Must be called on the browser process UI thread.
-  ///
-  struct _cef_request_context_t*(CEF_CALLBACK* get_loader_context)(
-      struct _cef_extension_t* self);
-
-  ///
-  // Returns true (1) if this extension is currently loaded. Must be called on
-  // the browser process UI thread.
-  ///
-  int(CEF_CALLBACK* is_loaded)(struct _cef_extension_t* self);
-
-  ///
-  // Unload this extension if it is not an internal extension and is currently
-  // loaded. Will result in a call to
-  // cef_extension_handler_t::OnExtensionUnloaded on success.
-  ///
-  void(CEF_CALLBACK* unload)(struct _cef_extension_t* self);
-} cef_extension_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_EXTENSION_CAPI_H_

include/capi/cef_extension_handler_capi.h

@@ -1,210 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=768e2436e54cceb2675ddd03ebdc61b5c0785bdc$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_extension_capi.h"
-#include "include/capi/cef_stream_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_client_t;
-
-///
-// Callback structure used for asynchronous continuation of
-// cef_extension_handler_t::GetExtensionResource.
-///
-typedef struct _cef_get_extension_resource_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Continue the request. Read the resource contents from |stream|.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_get_extension_resource_callback_t* self,
-                           struct _cef_stream_reader_t* stream);
-
-  ///
-  // Cancel the request.
-  ///
-  void(CEF_CALLBACK* cancel)(
-      struct _cef_get_extension_resource_callback_t* self);
-} cef_get_extension_resource_callback_t;
-
-///
-// Implement this structure to handle events related to browser extensions. The
-// functions of this structure will be called on the UI thread. See
-// cef_request_context_t::LoadExtension for information about extension loading.
-///
-typedef struct _cef_extension_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called if the cef_request_context_t::LoadExtension request fails. |result|
-  // will be the error code.
-  ///
-  void(CEF_CALLBACK* on_extension_load_failed)(
-      struct _cef_extension_handler_t* self,
-      cef_errorcode_t result);
-
-  ///
-  // Called if the cef_request_context_t::LoadExtension request succeeds.
-  // |extension| is the loaded extension.
-  ///
-  void(CEF_CALLBACK* on_extension_loaded)(struct _cef_extension_handler_t* self,
-                                          struct _cef_extension_t* extension);
-
-  ///
-  // Called after the cef_extension_t::Unload request has completed.
-  ///
-  void(CEF_CALLBACK* on_extension_unloaded)(
-      struct _cef_extension_handler_t* self,
-      struct _cef_extension_t* extension);
-
-  ///
-  // Called when an extension needs a browser to host a background script
-  // specified via the "background" manifest key. The browser will have no
-  // visible window and cannot be displayed. |extension| is the extension that
-  // is loading the background script. |url| is an internally generated
-  // reference to an HTML page that will be used to load the background script
-  // via a <script> src attribute. To allow creation of the browser optionally
-  // modify |client| and |settings| and return false (0). To cancel creation of
-  // the browser (and consequently cancel load of the background script) return
-  // true (1). Successful creation will be indicated by a call to
-  // cef_life_span_handler_t::OnAfterCreated, and
-  // cef_browser_host_t::IsBackgroundHost will return true (1) for the resulting
-  // browser. See https://developer.chrome.com/extensions/event_pages for more
-  // information about extension background script usage.
-  ///
-  int(CEF_CALLBACK* on_before_background_browser)(
-      struct _cef_extension_handler_t* self,
-      struct _cef_extension_t* extension,
-      const cef_string_t* url,
-      struct _cef_client_t** client,
-      struct _cef_browser_settings_t* settings);
-
-  ///
-  // Called when an extension API (e.g. chrome.tabs.create) requests creation of
-  // a new browser. |extension| and |browser| are the source of the API call.
-  // |active_browser| may optionally be specified via the windowId property or
-  // returned via the get_active_browser() callback and provides the default
-  // |client| and |settings| values for the new browser. |index| is the position
-  // value optionally specified via the index property. |url| is the URL that
-  // will be loaded in the browser. |active| is true (1) if the new browser
-  // should be active when opened.  To allow creation of the browser optionally
-  // modify |windowInfo|, |client| and |settings| and return false (0). To
-  // cancel creation of the browser return true (1). Successful creation will be
-  // indicated by a call to cef_life_span_handler_t::OnAfterCreated. Any
-  // modifications to |windowInfo| will be ignored if |active_browser| is
-  // wrapped in a cef_browser_view_t.
-  ///
-  int(CEF_CALLBACK* on_before_browser)(
-      struct _cef_extension_handler_t* self,
-      struct _cef_extension_t* extension,
-      struct _cef_browser_t* browser,
-      struct _cef_browser_t* active_browser,
-      int index,
-      const cef_string_t* url,
-      int active,
-      struct _cef_window_info_t* windowInfo,
-      struct _cef_client_t** client,
-      struct _cef_browser_settings_t* settings);
-
-  ///
-  // Called when no tabId is specified to an extension API call that accepts a
-  // tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
-  // source of the API call. Return the browser that will be acted on by the API
-  // call or return NULL to act on |browser|. The returned browser must share
-  // the same cef_request_context_t as |browser|. Incognito browsers should not
-  // be considered unless the source extension has incognito access enabled, in
-  // which case |include_incognito| will be true (1).
-  ///
-  struct _cef_browser_t*(CEF_CALLBACK* get_active_browser)(
-      struct _cef_extension_handler_t* self,
-      struct _cef_extension_t* extension,
-      struct _cef_browser_t* browser,
-      int include_incognito);
-
-  ///
-  // Called when the tabId associated with |target_browser| is specified to an
-  // extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-  // |extension| and |browser| are the source of the API call. Return true (1)
-  // to allow access of false (0) to deny access. Access to incognito browsers
-  // should not be allowed unless the source extension has incognito access
-  // enabled, in which case |include_incognito| will be true (1).
-  ///
-  int(CEF_CALLBACK* can_access_browser)(struct _cef_extension_handler_t* self,
-                                        struct _cef_extension_t* extension,
-                                        struct _cef_browser_t* browser,
-                                        int include_incognito,
-                                        struct _cef_browser_t* target_browser);
-
-  ///
-  // Called to retrieve an extension resource that would normally be loaded from
-  // disk (e.g. if a file parameter is specified to chrome.tabs.executeScript).
-  // |extension| and |browser| are the source of the resource request. |file| is
-  // the requested relative file path. To handle the resource request return
-  // true (1) and execute |callback| either synchronously or asynchronously. For
-  // the default behavior which reads the resource from the extension directory
-  // on disk return false (0). Localization substitutions will not be applied to
-  // resources handled via this function.
-  ///
-  int(CEF_CALLBACK* get_extension_resource)(
-      struct _cef_extension_handler_t* self,
-      struct _cef_extension_t* extension,
-      struct _cef_browser_t* browser,
-      const cef_string_t* file,
-      struct _cef_get_extension_resource_callback_t* callback);
-} cef_extension_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_EXTENSION_HANDLER_CAPI_H_

include/capi/cef_file_util_capi.h

@@ -1,131 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=e76fa23e9682bf0865319d93e4009752ac8f854f$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Creates a directory and all parent directories if they don't already exist.
-// Returns true (1) on successful creation or if the directory already exists.
-// The directory is only readable by the current user. Calling this function on
-// the browser process UI or IO threads is not allowed.
-///
-CEF_EXPORT int cef_create_directory(const cef_string_t* full_path);
-
-///
-// Get the temporary directory provided by the system.
-//
-// WARNING: In general, you should use the temp directory variants below instead
-// of this function. Those variants will ensure that the proper permissions are
-// set so that other users on the system can't edit them while they're open
-// (which could lead to security issues).
-///
-CEF_EXPORT int cef_get_temp_directory(cef_string_t* temp_dir);
-
-///
-// Creates a new directory. On Windows if |prefix| is provided the new directory
-// name is in the format of "prefixyyyy". Returns true (1) on success and sets
-// |new_temp_path| to the full path of the directory that was created. The
-// directory is only readable by the current user. Calling this function on the
-// browser process UI or IO threads is not allowed.
-///
-CEF_EXPORT int cef_create_new_temp_directory(const cef_string_t* prefix,
-                                             cef_string_t* new_temp_path);
-
-///
-// Creates a directory within another directory. Extra characters will be
-// appended to |prefix| to ensure that the new directory does not have the same
-// name as an existing directory. Returns true (1) on success and sets |new_dir|
-// to the full path of the directory that was created. The directory is only
-// readable by the current user. Calling this function on the browser process UI
-// or IO threads is not allowed.
-///
-CEF_EXPORT int cef_create_temp_directory_in_directory(
-    const cef_string_t* base_dir,
-    const cef_string_t* prefix,
-    cef_string_t* new_dir);
-
-///
-// Returns true (1) if the given path exists and is a directory. Calling this
-// function on the browser process UI or IO threads is not allowed.
-///
-CEF_EXPORT int cef_directory_exists(const cef_string_t* path);
-
-///
-// Deletes the given path whether it's a file or a directory. If |path| is a
-// directory all contents will be deleted.  If |recursive| is true (1) any sub-
-// directories and their contents will also be deleted (equivalent to executing
-// "rm -rf", so use with caution). On POSIX environments if |path| is a symbolic
-// link then only the symlink will be deleted. Returns true (1) on successful
-// deletion or if |path| does not exist. Calling this function on the browser
-// process UI or IO threads is not allowed.
-///
-CEF_EXPORT int cef_delete_file(const cef_string_t* path, int recursive);
-
-///
-// Writes the contents of |src_dir| into a zip archive at |dest_file|. If
-// |include_hidden_files| is true (1) files starting with "." will be included.
-// Returns true (1) on success.  Calling this function on the browser process UI
-// or IO threads is not allowed.
-///
-CEF_EXPORT int cef_zip_directory(const cef_string_t* src_dir,
-                                 const cef_string_t* dest_file,
-                                 int include_hidden_files);
-
-///
-// Loads the existing "Certificate Revocation Lists" file that is managed by
-// Google Chrome. This file can generally be found in Chrome's User Data
-// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
-// Windows) and is updated periodically by Chrome's component updater service.
-// Must be called in the browser process after the context has been initialized.
-// See https://dev.chromium.org/Home/chromium-security/crlsets for background.
-///
-CEF_EXPORT void cef_load_crlsets_file(const cef_string_t* path);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_FILE_UTIL_CAPI_H_

include/capi/cef_find_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,20 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f2e80b8637b07f19adea666e554269de4627e399$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_FIND_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_FIND_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to handle events related to find results. The
 // functions of this structure will be called on the UI thread.
@@ -55,26 +53,23 @@ typedef struct _cef_find_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called to report find results returned by cef_browser_host_t::find().
-  // |identifer| is a unique incremental identifier for the currently active
-  // search, |count| is the number of matches currently identified,
-  // |selectionRect| is the location of where the match was found (in window
-  // coordinates), |activeMatchOrdinal| is the current position in the search
-  // results, and |finalUpdate| is true (1) if this is the last find
-  // notification.
+  // Called to report find results returned by cef_browser_t::find().
+  // |identifer| is the identifier passed to cef_browser_t::find(), |count| is
+  // the number of matches currently identified, |selectionRect| is the location
+  // of where the match was found (in window coordinates), |activeMatchOrdinal|
+  // is the current position in the search results, and |finalUpdate| is true
+  // (1) if this is the last find notification.
   ///
-  void(CEF_CALLBACK* on_find_result)(struct _cef_find_handler_t* self,
-                                     struct _cef_browser_t* browser,
-                                     int identifier,
-                                     int count,
-                                     const cef_rect_t* selectionRect,
-                                     int activeMatchOrdinal,
-                                     int finalUpdate);
+  void (CEF_CALLBACK *on_find_result)(struct _cef_find_handler_t* self,
+      struct _cef_browser_t* browser, int identifier, int count,
+      const cef_rect_t* selectionRect, int activeMatchOrdinal,
+      int finalUpdate);
 } cef_find_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_focus_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,22 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=a136a2679c8af339b21a89e8ae3090a9dbb8daa7$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_dom_capi.h"
-#include "include/capi/cef_frame_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to handle events related to focus. The functions of
 // this structure will be called on the UI thread.
@@ -57,7 +53,7 @@ typedef struct _cef_focus_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
   // Called when the browser component is about to loose focus. For instance, if
@@ -65,26 +61,31 @@ typedef struct _cef_focus_handler_t {
   // will be true (1) if the browser is giving focus to the next component and
   // false (0) if the browser is giving focus to the previous component.
   ///
-  void(CEF_CALLBACK* on_take_focus)(struct _cef_focus_handler_t* self,
-                                    struct _cef_browser_t* browser,
-                                    int next);
+  void (CEF_CALLBACK *on_take_focus)(struct _cef_focus_handler_t* self,
+      struct _cef_browser_t* browser, int next);
 
   ///
   // Called when the browser component is requesting focus. |source| indicates
   // where the focus request is originating from. Return false (0) to allow the
   // focus to be set or true (1) to cancel setting the focus.
   ///
-  int(CEF_CALLBACK* on_set_focus)(struct _cef_focus_handler_t* self,
-                                  struct _cef_browser_t* browser,
-                                  cef_focus_source_t source);
+  int (CEF_CALLBACK *on_set_focus)(struct _cef_focus_handler_t* self,
+      struct _cef_browser_t* browser, enum cef_handler_focus_source_t source);
 
   ///
-  // Called when the browser component has received focus.
+  // Called when a new node in the the browser gets focus. The |node| value may
+  // be NULL if no specific node has gained focus. The node object passed to
+  // this function represents a snapshot of the DOM at the time this function is
+  // executed. DOM objects are only valid for the scope of this function. Do not
+  // keep references to or attempt to access any DOM objects outside the scope
+  // of this function.
   ///
-  void(CEF_CALLBACK* on_got_focus)(struct _cef_focus_handler_t* self,
-                                   struct _cef_browser_t* browser);
+  void (CEF_CALLBACK *on_focused_node_changed)(
+      struct _cef_focus_handler_t* self, struct _cef_browser_t* browser,
+      struct _cef_frame_t* frame, struct _cef_domnode_t* node);
 } cef_focus_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_frame_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,117 +33,113 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=8527ceea6b8778d6fabc1b4ef82e4faa06ba777a$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_dom_capi.h"
-#include "include/capi/cef_process_message_capi.h"
-#include "include/capi/cef_request_capi.h"
-#include "include/capi/cef_stream_capi.h"
-#include "include/capi/cef_string_visitor_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _cef_browser_t;
-struct _cef_urlrequest_client_t;
-struct _cef_urlrequest_t;
-struct _cef_v8context_t;
+#include "include/capi/cef_base_capi.h"
+
 
 ///
-// Structure used to represent a frame in the browser window. When used in the
-// browser process the functions of this structure may be called on any thread
-// unless otherwise indicated in the comments. When used in the render process
-// the functions of this structure may only be called on the main thread.
+// Structure used to represent a frame in the browser window. The functions of
+// this structure may be called on any thread unless otherwise indicated in the
+// comments.
 ///
 typedef struct _cef_frame_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // True if this object is currently attached to a valid frame.
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_frame_t* self);
+  cef_base_t base;
 
   ///
   // Execute undo in this frame.
   ///
-  void(CEF_CALLBACK* undo)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *undo)(struct _cef_frame_t* self);
 
   ///
   // Execute redo in this frame.
   ///
-  void(CEF_CALLBACK* redo)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *redo)(struct _cef_frame_t* self);
 
   ///
   // Execute cut in this frame.
   ///
-  void(CEF_CALLBACK* cut)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *cut)(struct _cef_frame_t* self);
 
   ///
   // Execute copy in this frame.
   ///
-  void(CEF_CALLBACK* copy)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *copy)(struct _cef_frame_t* self);
 
   ///
   // Execute paste in this frame.
   ///
-  void(CEF_CALLBACK* paste)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *paste)(struct _cef_frame_t* self);
 
   ///
   // Execute delete in this frame.
   ///
-  void(CEF_CALLBACK* del)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *del)(struct _cef_frame_t* self);
 
   ///
   // Execute select all in this frame.
   ///
-  void(CEF_CALLBACK* select_all)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *select_all)(struct _cef_frame_t* self);
+
+  ///
+  // Execute printing in the this frame.  The user will be prompted with the
+  // print dialog appropriate to the operating system.
+  ///
+  void (CEF_CALLBACK *print)(struct _cef_frame_t* self);
 
   ///
   // Save this frame's HTML source to a temporary file and open it in the
-  // default text viewing application. This function can only be called from the
-  // browser process.
+  // default text viewing application.
   ///
-  void(CEF_CALLBACK* view_source)(struct _cef_frame_t* self);
+  void (CEF_CALLBACK *view_source)(struct _cef_frame_t* self);
 
   ///
-  // Retrieve this frame's HTML source as a string sent to the specified
-  // visitor.
+  // Returns this frame's HTML source as a string. This function should only be
+  // called on the UI thread.
   ///
-  void(CEF_CALLBACK* get_source)(struct _cef_frame_t* self,
-                                 struct _cef_string_visitor_t* visitor);
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_source)(struct _cef_frame_t* self);
 
   ///
-  // Retrieve this frame's display text as a string sent to the specified
-  // visitor.
+  // Returns this frame's display text as a string. This function should only be
+  // called on the UI thread.
   ///
-  void(CEF_CALLBACK* get_text)(struct _cef_frame_t* self,
-                               struct _cef_string_visitor_t* visitor);
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_text)(struct _cef_frame_t* self);
 
   ///
   // Load the request represented by the |request| object.
-  //
-  // WARNING: This function will fail with "bad IPC message" reason
-  // INVALID_INITIATOR_ORIGIN (213) unless you first navigate to the request
-  // origin using some other mechanism (LoadURL, link click, etc).
   ///
-  void(CEF_CALLBACK* load_request)(struct _cef_frame_t* self,
-                                   struct _cef_request_t* request);
+  void (CEF_CALLBACK *load_request)(struct _cef_frame_t* self,
+      struct _cef_request_t* request);
 
   ///
   // Load the specified |url|.
   ///
-  void(CEF_CALLBACK* load_url)(struct _cef_frame_t* self,
-                               const cef_string_t* url);
+  void (CEF_CALLBACK *load_url)(struct _cef_frame_t* self,
+      const cef_string_t* url);
+
+  ///
+  // Load the contents of |string_val| with the optional dummy target |url|.
+  ///
+  void (CEF_CALLBACK *load_string)(struct _cef_frame_t* self,
+      const cef_string_t* string_val, const cef_string_t* url);
+
+  ///
+  // Load the contents of |stream| with the optional dummy target |url|.
+  ///
+  void (CEF_CALLBACK *load_stream)(struct _cef_frame_t* self,
+      struct _cef_stream_reader_t* stream, const cef_string_t* url);
 
   ///
   // Execute a string of JavaScript code in this frame. The |script_url|
@@ -152,20 +148,20 @@ typedef struct _cef_frame_t {
   // error.  The |start_line| parameter is the base line number to use for error
   // reporting.
   ///
-  void(CEF_CALLBACK* execute_java_script)(struct _cef_frame_t* self,
-                                          const cef_string_t* code,
-                                          const cef_string_t* script_url,
-                                          int start_line);
+  void (CEF_CALLBACK *execute_java_script)(struct _cef_frame_t* self,
+      const cef_string_t* jsCode, const cef_string_t* scriptUrl,
+      int startLine);
 
   ///
   // Returns true (1) if this is the main (top-level) frame.
   ///
-  int(CEF_CALLBACK* is_main)(struct _cef_frame_t* self);
+  int (CEF_CALLBACK *is_main)(struct _cef_frame_t* self);
 
   ///
-  // Returns true (1) if this is the focused frame.
+  // Returns true (1) if this is the focused frame. This function should only be
+  // called on the UI thread.
   ///
-  int(CEF_CALLBACK* is_focused)(struct _cef_frame_t* self);
+  int (CEF_CALLBACK *is_focused)(struct _cef_frame_t* self);
 
   ///
   // Returns the name for this frame. If the frame has an assigned name (for
@@ -175,86 +171,45 @@ typedef struct _cef_frame_t {
   // value.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_frame_t* self);
+  cef_string_userfree_t (CEF_CALLBACK *get_name)(struct _cef_frame_t* self);
 
   ///
-  // Returns the globally unique identifier for this frame or < 0 if the
-  // underlying frame does not yet exist.
+  // Returns the globally unique identifier for this frame.
   ///
-  int64(CEF_CALLBACK* get_identifier)(struct _cef_frame_t* self);
+  int64 (CEF_CALLBACK *get_identifier)(struct _cef_frame_t* self);
 
   ///
   // Returns the parent of this frame or NULL if this is the main (top-level)
-  // frame.
+  // frame. This function should only be called on the UI thread.
   ///
-  struct _cef_frame_t*(CEF_CALLBACK* get_parent)(struct _cef_frame_t* self);
+  struct _cef_frame_t* (CEF_CALLBACK *get_parent)(struct _cef_frame_t* self);
 
   ///
   // Returns the URL currently loaded in this frame.
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_frame_t* self);
+  cef_string_userfree_t (CEF_CALLBACK *get_url)(struct _cef_frame_t* self);
 
   ///
   // Returns the browser that this frame belongs to.
   ///
-  struct _cef_browser_t*(CEF_CALLBACK* get_browser)(struct _cef_frame_t* self);
+  struct _cef_browser_t* (CEF_CALLBACK *get_browser)(struct _cef_frame_t* self);
 
   ///
-  // Get the V8 context associated with the frame. This function can only be
-  // called from the render process.
+  // Visit the DOM document.
   ///
-  struct _cef_v8context_t*(CEF_CALLBACK* get_v8context)(
+  void (CEF_CALLBACK *visit_dom)(struct _cef_frame_t* self,
+      struct _cef_domvisitor_t* visitor);
+
+  ///
+  // Get the V8 context associated with the frame. This function should only be
+  // called on the UI thread.
+  ///
+  struct _cef_v8context_t* (CEF_CALLBACK *get_v8context)(
       struct _cef_frame_t* self);
-
-  ///
-  // Visit the DOM document. This function can only be called from the render
-  // process.
-  ///
-  void(CEF_CALLBACK* visit_dom)(struct _cef_frame_t* self,
-                                struct _cef_domvisitor_t* visitor);
-
-  ///
-  // Create a new URL request that will be treated as originating from this
-  // frame and the associated browser. This request may be intercepted by the
-  // client via cef_resource_request_handler_t or cef_scheme_handler_factory_t.
-  // Use cef_urlrequest_t::Create instead if you do not want the request to have
-  // this association, in which case it may be handled differently (see
-  // documentation on that function). Requests may originate from both the
-  // browser process and the render process.
-  //
-  // For requests originating from the browser process:
-  //   - POST data may only contain a single element of type PDE_TYPE_FILE or
-  //     PDE_TYPE_BYTES.
-  // For requests originating from the render process:
-  //   - POST data may only contain a single element of type PDE_TYPE_BYTES.
-  //   - If the response contains Content-Disposition or Mime-Type header values
-  //     that would not normally be rendered then the response may receive
-  //     special handling inside the browser (for example, via the file download
-  //     code path instead of the URL request code path).
-  //
-  // The |request| object will be marked as read-only after calling this
-  // function.
-  ///
-  struct _cef_urlrequest_t*(CEF_CALLBACK* create_urlrequest)(
-      struct _cef_frame_t* self,
-      struct _cef_request_t* request,
-      struct _cef_urlrequest_client_t* client);
-
-  ///
-  // Send a message to the specified |target_process|. Ownership of the message
-  // contents will be transferred and the |message| reference will be
-  // invalidated. Message delivery is not guaranteed in all cases (for example,
-  // if the browser is closing, navigating, or if the target process crashes).
-  // Send an ACK message back from the target process if confirmation is
-  // required.
-  ///
-  void(CEF_CALLBACK* send_process_message)(
-      struct _cef_frame_t* self,
-      cef_process_id_t target_process,
-      struct _cef_process_message_t* message);
 } cef_frame_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_frame_handler_capi.h

@@ -1,194 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=8f791b2d1d5bea27f9e6ca5e0db731a0a76d181c$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_frame_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Implement this structure to handle events related to cef_frame_t life span.
-// The order of callbacks is:
-//
-// (1) During initial cef_browser_host_t creation and navigation of the main
-// frame: - cef_frame_handler_t::OnFrameCreated => The initial main frame object
-// has been
-//   created. Any commands will be queued until the frame is attached.
-// - cef_frame_handler_t::OnMainFrameChanged => The initial main frame object
-// has
-//   been assigned to the browser.
-// - cef_life_span_handler_t::OnAfterCreated => The browser is now valid and can
-// be
-//   used.
-// - cef_frame_handler_t::OnFrameAttached => The initial main frame object is
-// now
-//   connected to its peer in the renderer process. Commands can be routed.
-//
-// (2) During further cef_browser_host_t navigation/loading of the main frame
-// and/or sub-frames: - cef_frame_handler_t::OnFrameCreated => A new main frame
-// or sub-frame object has
-//   been created. Any commands will be queued until the frame is attached.
-// - cef_frame_handler_t::OnFrameAttached => A new main frame or sub-frame
-// object is
-//   now connected to its peer in the renderer process. Commands can be routed.
-// - cef_frame_handler_t::OnFrameDetached => An existing main frame or sub-frame
-//   object has lost its connection to the renderer process. If multiple objects
-//   are detached at the same time then notifications will be sent for any
-//   sub-frame objects before the main frame object. Commands can no longer be
-//   routed and will be discarded.
-// - cef_frame_handler_t::OnMainFrameChanged => A new main frame object has been
-//   assigned to the browser. This will only occur with cross-origin navigation
-//   or re-navigation after renderer process termination (due to crashes, etc).
-//
-// (3) During final cef_browser_host_t destruction of the main frame: -
-// cef_frame_handler_t::OnFrameDetached => Any sub-frame objects have lost their
-//   connection to the renderer process. Commands can no longer be routed and
-//   will be discarded.
-// - cef_life_span_handler_t::OnBeforeClose => The browser has been destroyed. -
-// cef_frame_handler_t::OnFrameDetached => The main frame object have lost its
-//   connection to the renderer process. Notifications will be sent for any
-//   sub-frame objects before the main frame object. Commands can no longer be
-//   routed and will be discarded.
-// - cef_frame_handler_t::OnMainFrameChanged => The final main frame object has
-// been
-//   removed from the browser.
-//
-// Cross-origin navigation and/or loading receives special handling.
-//
-// When the main frame navigates to a different origin the OnMainFrameChanged
-// callback (2) will be executed with the old and new main frame objects.
-//
-// When a new sub-frame is loaded in, or an existing sub-frame is navigated to,
-// a different origin from the parent frame, a temporary sub-frame object will
-// first be created in the parent's renderer process. That temporary sub-frame
-// will then be discarded after the real cross-origin sub-frame is created in
-// the new/target renderer process. The client will receive cross-origin
-// navigation callbacks (2) for the transition from the temporary sub-frame to
-// the real sub-frame. The temporary sub-frame will not recieve or execute
-// commands during this transitional period (any sent commands will be
-// discarded).
-//
-// When a new popup browser is created in a different origin from the parent
-// browser, a temporary main frame object for the popup will first be created in
-// the parent's renderer process. That temporary main frame will then be
-// discarded after the real cross-origin main frame is created in the new/target
-// renderer process. The client will recieve creation and initial navigation
-// callbacks (1) for the temporary main frame, followed by cross-origin
-// navigation callbacks (2) for the transition from the temporary main frame to
-// the real main frame. The temporary main frame may receive and execute
-// commands during this transitional period (any sent commands may be executed,
-// but the behavior is potentially undesirable since they execute in the parent
-// browser's renderer process and not the new/target renderer process).
-//
-// Callbacks will not be executed for placeholders that may be created during
-// pre-commit navigation for sub-frames that do not yet exist in the renderer
-// process. Placeholders will have cef_frame_t::get_identifier() == -4.
-//
-// The functions of this structure will be called on the UI thread unless
-// otherwise indicated.
-///
-typedef struct _cef_frame_handler_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Called when a new frame is created. This will be the first notification
-  // that references |frame|. Any commands that require transport to the
-  // associated renderer process (LoadRequest, SendProcessMessage, GetSource,
-  // etc.) will be queued until OnFrameAttached is called for |frame|.
-  ///
-  void(CEF_CALLBACK* on_frame_created)(struct _cef_frame_handler_t* self,
-                                       struct _cef_browser_t* browser,
-                                       struct _cef_frame_t* frame);
-
-  ///
-  // Called when a frame can begin routing commands to/from the associated
-  // renderer process. |reattached| will be true (1) if the frame was re-
-  // attached after exiting the BackForwardCache. Any commands that were queued
-  // have now been dispatched.
-  ///
-  void(CEF_CALLBACK* on_frame_attached)(struct _cef_frame_handler_t* self,
-                                        struct _cef_browser_t* browser,
-                                        struct _cef_frame_t* frame,
-                                        int reattached);
-
-  ///
-  // Called when a frame loses its connection to the renderer process and will
-  // be destroyed. Any pending or future commands will be discarded and
-  // cef_frame_t::is_valid() will now return false (0) for |frame|. If called
-  // after cef_life_span_handler_t::on_before_close() during browser destruction
-  // then cef_browser_t::is_valid() will return false (0) for |browser|.
-  ///
-  void(CEF_CALLBACK* on_frame_detached)(struct _cef_frame_handler_t* self,
-                                        struct _cef_browser_t* browser,
-                                        struct _cef_frame_t* frame);
-
-  ///
-  // Called when the main frame changes due to (a) initial browser creation, (b)
-  // final browser destruction, (c) cross-origin navigation or (d) re-navigation
-  // after renderer process termination (due to crashes, etc). |old_frame| will
-  // be NULL and |new_frame| will be non-NULL when a main frame is assigned to
-  // |browser| for the first time. |old_frame| will be non-NULL and |new_frame|
-  // will be NULL and  when a main frame is removed from |browser| for the last
-  // time. Both |old_frame| and |new_frame| will be non-NULL for cross-origin
-  // navigations or re-navigation after renderer process termination. This
-  // function will be called after on_frame_created() for |new_frame| and/or
-  // after on_frame_detached() for |old_frame|. If called after
-  // cef_life_span_handler_t::on_before_close() during browser destruction then
-  // cef_browser_t::is_valid() will return false (0) for |browser|.
-  ///
-  void(CEF_CALLBACK* on_main_frame_changed)(struct _cef_frame_handler_t* self,
-                                            struct _cef_browser_t* browser,
-                                            struct _cef_frame_t* old_frame,
-                                            struct _cef_frame_t* new_frame);
-} cef_frame_handler_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_FRAME_HANDLER_CAPI_H_

include/capi/cef_i18n_util_capi.h

@@ -1,58 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=c063e5f0e0c9fef71bdb56e7cc3ea775de17a3ea$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Returns true (1) if the application text direction is right-to-left.
-///
-CEF_EXPORT int cef_is_rtl(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_I18N_UTIL_CAPI_H_

include/capi/cef_image_capi.h

@@ -1,205 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=bbc87eb4ecaf92c900193afef7059caedbe8ab3a$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_values_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Container for a single image represented at different scale factors. All
-// image representations should be the same size in density independent pixel
-// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
-// then the image at scale factor 2.0 should be 200x200 pixels -- both images
-// will display with a DIP size of 100x100 units. The functions of this
-// structure can be called on any browser process thread.
-///
-typedef struct _cef_image_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this Image is NULL.
-  ///
-  int(CEF_CALLBACK* is_empty)(struct _cef_image_t* self);
-
-  ///
-  // Returns true (1) if this Image and |that| Image share the same underlying
-  // storage. Will also return true (1) if both images are NULL.
-  ///
-  int(CEF_CALLBACK* is_same)(struct _cef_image_t* self,
-                             struct _cef_image_t* that);
-
-  ///
-  // Add a bitmap image representation for |scale_factor|. Only 32-bit RGBA/BGRA
-  // formats are supported. |pixel_width| and |pixel_height| are the bitmap
-  // representation size in pixel coordinates. |pixel_data| is the array of
-  // pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in size.
-  // |color_type| and |alpha_type| values specify the pixel format.
-  ///
-  int(CEF_CALLBACK* add_bitmap)(struct _cef_image_t* self,
-                                float scale_factor,
-                                int pixel_width,
-                                int pixel_height,
-                                cef_color_type_t color_type,
-                                cef_alpha_type_t alpha_type,
-                                const void* pixel_data,
-                                size_t pixel_data_size);
-
-  ///
-  // Add a PNG image representation for |scale_factor|. |png_data| is the image
-  // data of size |png_data_size|. Any alpha transparency in the PNG data will
-  // be maintained.
-  ///
-  int(CEF_CALLBACK* add_png)(struct _cef_image_t* self,
-                             float scale_factor,
-                             const void* png_data,
-                             size_t png_data_size);
-
-  ///
-  // Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
-  // image data of size |jpeg_data_size|. The JPEG format does not support
-  // transparency so the alpha byte will be set to 0xFF for all pixels.
-  ///
-  int(CEF_CALLBACK* add_jpeg)(struct _cef_image_t* self,
-                              float scale_factor,
-                              const void* jpeg_data,
-                              size_t jpeg_data_size);
-
-  ///
-  // Returns the image width in density independent pixel (DIP) units.
-  ///
-  size_t(CEF_CALLBACK* get_width)(struct _cef_image_t* self);
-
-  ///
-  // Returns the image height in density independent pixel (DIP) units.
-  ///
-  size_t(CEF_CALLBACK* get_height)(struct _cef_image_t* self);
-
-  ///
-  // Returns true (1) if this image contains a representation for
-  // |scale_factor|.
-  ///
-  int(CEF_CALLBACK* has_representation)(struct _cef_image_t* self,
-                                        float scale_factor);
-
-  ///
-  // Removes the representation for |scale_factor|. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* remove_representation)(struct _cef_image_t* self,
-                                           float scale_factor);
-
-  ///
-  // Returns information for the representation that most closely matches
-  // |scale_factor|. |actual_scale_factor| is the actual scale factor for the
-  // representation. |pixel_width| and |pixel_height| are the representation
-  // size in pixel coordinates. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* get_representation_info)(struct _cef_image_t* self,
-                                             float scale_factor,
-                                             float* actual_scale_factor,
-                                             int* pixel_width,
-                                             int* pixel_height);
-
-  ///
-  // Returns the bitmap representation that most closely matches |scale_factor|.
-  // Only 32-bit RGBA/BGRA formats are supported. |color_type| and |alpha_type|
-  // values specify the desired output pixel format. |pixel_width| and
-  // |pixel_height| are the output representation size in pixel coordinates.
-  // Returns a cef_binary_value_t containing the pixel data on success or NULL
-  // on failure.
-  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_as_bitmap)(
-      struct _cef_image_t* self,
-      float scale_factor,
-      cef_color_type_t color_type,
-      cef_alpha_type_t alpha_type,
-      int* pixel_width,
-      int* pixel_height);
-
-  ///
-  // Returns the PNG representation that most closely matches |scale_factor|. If
-  // |with_transparency| is true (1) any alpha transparency in the image will be
-  // represented in the resulting PNG data. |pixel_width| and |pixel_height| are
-  // the output representation size in pixel coordinates. Returns a
-  // cef_binary_value_t containing the PNG image data on success or NULL on
-  // failure.
-  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_as_png)(
-      struct _cef_image_t* self,
-      float scale_factor,
-      int with_transparency,
-      int* pixel_width,
-      int* pixel_height);
-
-  ///
-  // Returns the JPEG representation that most closely matches |scale_factor|.
-  // |quality| determines the compression level with 0 == lowest and 100 ==
-  // highest. The JPEG format does not support alpha transparency and the alpha
-  // channel, if any, will be discarded. |pixel_width| and |pixel_height| are
-  // the output representation size in pixel coordinates. Returns a
-  // cef_binary_value_t containing the JPEG image data on success or NULL on
-  // failure.
-  ///
-  struct _cef_binary_value_t*(CEF_CALLBACK* get_as_jpeg)(
-      struct _cef_image_t* self,
-      float scale_factor,
-      int quality,
-      int* pixel_width,
-      int* pixel_height);
-} cef_image_t;
-
-///
-// Create a new cef_image_t. It will initially be NULL. Use the Add*() functions
-// to add representations at different scale factors.
-///
-CEF_EXPORT cef_image_t* cef_image_create(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_IMAGE_CAPI_H_

include/capi/cef_jsdialog_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,38 +33,17 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=c68332a779bab425aa2e6a858d20a43448631890$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-///
-// Callback structure used for asynchronous continuation of JavaScript dialog
-// requests.
-///
-typedef struct _cef_jsdialog_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
+#include "include/capi/cef_base_capi.h"
 
-  ///
-  // Continue the JS dialog request. Set |success| to true (1) if the OK button
-  // was pressed. The |user_input| value should be specified for prompt dialogs.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_jsdialog_callback_t* self,
-                           int success,
-                           const cef_string_t* user_input);
-} cef_jsdialog_callback_t;
 
 ///
 // Implement this structure to handle events related to JavaScript dialogs. The
@@ -74,65 +53,38 @@ typedef struct _cef_jsdialog_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called to run a JavaScript dialog. If |origin_url| is non-NULL it can be
-  // passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
-  // and user-friendly display string. The |default_prompt_text| value will be
-  // specified for prompt dialogs only. Set |suppress_message| to true (1) and
-  // return false (0) to suppress the message (suppressing messages is
-  // preferable to immediately executing the callback as this is used to detect
-  // presumably malicious behavior like spamming alert messages in
-  // onbeforeunload). Set |suppress_message| to false (0) and return false (0)
-  // to use the default implementation (the default implementation will show one
-  // modal dialog at a time and suppress any additional dialog requests until
-  // the displayed dialog is dismissed). Return true (1) if the application will
-  // use a custom dialog or if the callback has been executed immediately.
-  // Custom dialogs may be either modal or modeless. If a custom dialog is used
-  // the application must execute |callback| once the custom dialog is
-  // dismissed.
+  // Called  to run a JavaScript alert message. Return false (0) to display the
+  // default alert or true (1) if you displayed a custom alert.
   ///
-  int(CEF_CALLBACK* on_jsdialog)(struct _cef_jsdialog_handler_t* self,
-                                 struct _cef_browser_t* browser,
-                                 const cef_string_t* origin_url,
-                                 cef_jsdialog_type_t dialog_type,
-                                 const cef_string_t* message_text,
-                                 const cef_string_t* default_prompt_text,
-                                 struct _cef_jsdialog_callback_t* callback,
-                                 int* suppress_message);
+  int (CEF_CALLBACK *on_jsalert)(struct _cef_jsdialog_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      const cef_string_t* message);
 
   ///
-  // Called to run a dialog asking the user if they want to leave a page. Return
-  // false (0) to use the default dialog implementation. Return true (1) if the
-  // application will use a custom dialog or if the callback has been executed
-  // immediately. Custom dialogs may be either modal or modeless. If a custom
-  // dialog is used the application must execute |callback| once the custom
-  // dialog is dismissed.
+  // Called to run a JavaScript confirm request. Return false (0) to display the
+  // default alert or true (1) if you displayed a custom alert. If you handled
+  // the alert set |retval| to true (1) if the user accepted the confirmation.
   ///
-  int(CEF_CALLBACK* on_before_unload_dialog)(
-      struct _cef_jsdialog_handler_t* self,
-      struct _cef_browser_t* browser,
-      const cef_string_t* message_text,
-      int is_reload,
-      struct _cef_jsdialog_callback_t* callback);
+  int (CEF_CALLBACK *on_jsconfirm)(struct _cef_jsdialog_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      const cef_string_t* message, int* retval);
 
   ///
-  // Called to cancel any pending dialogs and reset any saved dialog state. Will
-  // be called due to events like page navigation irregardless of whether any
-  // dialogs are currently pending.
+  // Called to run a JavaScript prompt request. Return false (0) to display the
+  // default prompt or true (1) if you displayed a custom prompt. If you handled
+  // the prompt set |retval| to true (1) if the user accepted the prompt and
+  // request and |result| to the resulting value.
   ///
-  void(CEF_CALLBACK* on_reset_dialog_state)(
-      struct _cef_jsdialog_handler_t* self,
-      struct _cef_browser_t* browser);
-
-  ///
-  // Called when the default implementation dialog is closed.
-  ///
-  void(CEF_CALLBACK* on_dialog_closed)(struct _cef_jsdialog_handler_t* self,
-                                       struct _cef_browser_t* browser);
+  int (CEF_CALLBACK *on_jsprompt)(struct _cef_jsdialog_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      const cef_string_t* message, const cef_string_t* defaultValue,
+      int* retval, cef_string_t* result);
 } cef_jsdialog_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_keyboard_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,20 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=140d3a3ce78f5e8ab50a24a2fd6377e7a8ea3256$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to handle events related to keyboard input. The
 // functions of this structure will be called on the UI thread.
@@ -55,33 +53,28 @@ typedef struct _cef_keyboard_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called before a keyboard event is sent to the renderer. |event| contains
-  // information about the keyboard event. |os_event| is the operating system
-  // event message, if any. Return true (1) if the event was handled or false
-  // (0) otherwise. If the event will be handled in on_key_event() as a keyboard
-  // shortcut set |is_keyboard_shortcut| to true (1) and return false (0).
+  // Called when the browser component receives a keyboard event. This function
+  // is called both before the event is passed to the renderer and after
+  // JavaScript in the page has had a chance to handle the event. |type| is the
+  // type of keyboard event, |code| is the windows scan-code for the event,
+  // |modifiers| is a set of bit- flags describing any pressed modifier keys and
+  // |isSystemKey| is true (1) if Windows considers this a 'system key' message
+  // (see http://msdn.microsoft.com/en-us/library/ms646286(VS.85).aspx). If
+  // |isAfterJavaScript| is true (1) then JavaScript in the page has had a
+  // chance to handle the event and has chosen not to. Only RAWKEYDOWN, KEYDOWN
+  // and CHAR events will be sent with |isAfterJavaScript| set to true (1).
+  // Return true (1) if the keyboard event was handled or false (0) to allow
+  // continued handling of the event by the renderer.
   ///
-  int(CEF_CALLBACK* on_pre_key_event)(struct _cef_keyboard_handler_t* self,
-                                      struct _cef_browser_t* browser,
-                                      const struct _cef_key_event_t* event,
-                                      cef_event_handle_t os_event,
-                                      int* is_keyboard_shortcut);
-
-  ///
-  // Called after the renderer and JavaScript in the page has had a chance to
-  // handle the event. |event| contains information about the keyboard event.
-  // |os_event| is the operating system event message, if any. Return true (1)
-  // if the keyboard event was handled or false (0) otherwise.
-  ///
-  int(CEF_CALLBACK* on_key_event)(struct _cef_keyboard_handler_t* self,
-                                  struct _cef_browser_t* browser,
-                                  const struct _cef_key_event_t* event,
-                                  cef_event_handle_t os_event);
+  int (CEF_CALLBACK *on_key_event)(struct _cef_keyboard_handler_t* self,
+      struct _cef_browser_t* browser, enum cef_handler_keyevent_type_t type,
+      int code, int modifiers, int isSystemKey, int isAfterJavaScript);
 } cef_keyboard_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_life_span_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,190 +33,80 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=34a6559587adbd0dc3143989a8c6e49e0664b43e$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _cef_client_t;
+#include "include/capi/cef_base_capi.h"
+
 
 ///
 // Implement this structure to handle events related to browser life span. The
-// functions of this structure will be called on the UI thread unless otherwise
-// indicated.
+// functions of this structure will be called on the UI thread.
 ///
 typedef struct _cef_life_span_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called on the UI thread before a new popup browser is created. The
-  // |browser| and |frame| values represent the source of the popup request. The
-  // |target_url| and |target_frame_name| values indicate where the popup
-  // browser should navigate and may be NULL if not specified with the request.
-  // The |target_disposition| value indicates where the user intended to open
-  // the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
-  // be true (1) if the popup was opened via explicit user gesture (e.g.
-  // clicking a link) or false (0) if the popup opened automatically (e.g. via
-  // the DomContentLoaded event). The |popupFeatures| structure contains
-  // additional information about the requested popup window. To allow creation
-  // of the popup browser optionally modify |windowInfo|, |client|, |settings|
-  // and |no_javascript_access| and return false (0). To cancel creation of the
-  // popup browser return true (1). The |client| and |settings| values will
-  // default to the source browser's values. If the |no_javascript_access| value
-  // is set to false (0) the new browser will not be scriptable and may not be
-  // hosted in the same renderer process as the source browser. Any
-  // modifications to |windowInfo| will be ignored if the parent browser is
-  // wrapped in a cef_browser_view_t. Popup browser creation will be canceled if
-  // the parent browser is destroyed before the popup browser creation completes
-  // (indicated by a call to OnAfterCreated for the popup browser). The
-  // |extra_info| parameter provides an opportunity to specify extra information
-  // specific to the created popup browser that will be passed to
-  // cef_render_process_handler_t::on_browser_created() in the render process.
+  // Called before a new popup window is created. The |parentBrowser| parameter
+  // will point to the parent browser window. The |popupFeatures| parameter will
+  // contain information about the style of popup window requested. Return false
+  // (0) to have the framework create the new popup window based on the
+  // parameters in |windowInfo|. Return true (1) to cancel creation of the popup
+  // window. By default, a newly created popup window will have the same client
+  // and settings as the parent window. To change the client for the new window
+  // modify the object that |client| points to. To change the settings for the
+  // new window modify the |settings| structure.
   ///
-  int(CEF_CALLBACK* on_before_popup)(
-      struct _cef_life_span_handler_t* self,
-      struct _cef_browser_t* browser,
-      struct _cef_frame_t* frame,
-      const cef_string_t* target_url,
-      const cef_string_t* target_frame_name,
-      cef_window_open_disposition_t target_disposition,
-      int user_gesture,
+  int (CEF_CALLBACK *on_before_popup)(struct _cef_life_span_handler_t* self,
+      struct _cef_browser_t* parentBrowser,
       const struct _cef_popup_features_t* popupFeatures,
-      struct _cef_window_info_t* windowInfo,
+      struct _cef_window_info_t* windowInfo, const cef_string_t* url,
       struct _cef_client_t** client,
-      struct _cef_browser_settings_t* settings,
-      struct _cef_dictionary_value_t** extra_info,
-      int* no_javascript_access);
+      struct _cef_browser_settings_t* settings);
 
   ///
-  // Called after a new browser is created. It is now safe to begin performing
-  // actions with |browser|. cef_frame_handler_t callbacks related to initial
-  // main frame creation will arrive before this callback. See
-  // cef_frame_handler_t documentation for additional usage information.
+  // Called after a new window is created.
   ///
-  void(CEF_CALLBACK* on_after_created)(struct _cef_life_span_handler_t* self,
-                                       struct _cef_browser_t* browser);
+  void (CEF_CALLBACK *on_after_created)(struct _cef_life_span_handler_t* self,
+      struct _cef_browser_t* browser);
 
   ///
-  // Called when a browser has recieved a request to close. This may result
-  // directly from a call to cef_browser_host_t::*close_browser() or indirectly
-  // if the browser is parented to a top-level window created by CEF and the
-  // user attempts to close that window (by clicking the 'X', for example). The
-  // do_close() function will be called after the JavaScript 'onunload' event
-  // has been fired.
-  //
-  // An application should handle top-level owner window close notifications by
-  // calling cef_browser_host_t::try_close_browser() or
-  // cef_browser_host_t::CloseBrowser(false (0)) instead of allowing the window
-  // to close immediately (see the examples below). This gives CEF an
-  // opportunity to process the 'onbeforeunload' event and optionally cancel the
-  // close before do_close() is called.
-  //
-  // When windowed rendering is enabled CEF will internally create a window or
-  // view to host the browser. In that case returning false (0) from do_close()
-  // will send the standard close notification to the browser's top-level owner
-  // window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
-  // Linux or cef_window_delegate_t::can_close() callback from Views). If the
-  // browser's host window/view has already been destroyed (via view hierarchy
-  // tear-down, for example) then do_close() will not be called for that browser
-  // since is no longer possible to cancel the close.
-  //
-  // When windowed rendering is disabled returning false (0) from do_close()
-  // will cause the browser object to be destroyed immediately.
-  //
-  // If the browser's top-level owner window requires a non-standard close
-  // notification then send that notification from do_close() and return true
-  // (1).
-  //
-  // The cef_life_span_handler_t::on_before_close() function will be called
-  // after do_close() (if do_close() is called) and immediately before the
-  // browser object is destroyed. The application should only exit after
-  // on_before_close() has been called for all existing browsers.
-  //
-  // The below examples describe what should happen during window close when the
-  // browser is parented to an application-provided top-level window.
-  //
-  // Example 1: Using cef_browser_host_t::try_close_browser(). This is
-  // recommended for clients using standard close handling and windows created
-  // on the browser process UI thread. 1.  User clicks the window close button
-  // which sends a close notification to
-  //     the application's top-level window.
-  // 2.  Application's top-level window receives the close notification and
-  //     calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
-  //     TryCloseBrowser() returns false so the client cancels the window close.
-  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
-  //     confirmation dialog (which can be overridden via
-  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
-  // 4.  User approves the close. 5.  JavaScript 'onunload' handler executes. 6.
-  // CEF sends a close notification to the application's top-level window
-  //     (because DoClose() returned false by default).
-  // 7.  Application's top-level window receives the close notification and
-  //     calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
-  //     allows the window close.
-  // 8.  Application's top-level window is destroyed. 9.  Application's
-  // on_before_close() handler is called and the browser object
-  //     is destroyed.
-  // 10. Application exits by calling cef_quit_message_loop() if no other
-  // browsers
-  //     exist.
-  //
-  // Example 2: Using cef_browser_host_t::CloseBrowser(false (0)) and
-  // implementing the do_close() callback. This is recommended for clients using
-  // non-standard close handling or windows that were not created on the browser
-  // process UI thread. 1.  User clicks the window close button which sends a
-  // close notification to
-  //     the application's top-level window.
-  // 2.  Application's top-level window receives the close notification and:
-  //     A. Calls CefBrowserHost::CloseBrowser(false).
-  //     B. Cancels the window close.
-  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
-  //     confirmation dialog (which can be overridden via
-  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
-  // 4.  User approves the close. 5.  JavaScript 'onunload' handler executes. 6.
-  // Application's do_close() handler is called. Application will:
-  //     A. Set a flag to indicate that the next close attempt will be allowed.
-  //     B. Return false.
-  // 7.  CEF sends an close notification to the application's top-level window.
-  // 8.  Application's top-level window receives the close notification and
-  //     allows the window to close based on the flag from #6B.
-  // 9.  Application's top-level window is destroyed. 10. Application's
-  // on_before_close() handler is called and the browser object
-  //     is destroyed.
-  // 11. Application exits by calling cef_quit_message_loop() if no other
-  // browsers
-  //     exist.
+  // Called when a modal window is about to display and the modal loop should
+  // begin running. Return false (0) to use the default modal loop
+  // implementation or true (1) to use a custom implementation.
   ///
-  int(CEF_CALLBACK* do_close)(struct _cef_life_span_handler_t* self,
-                              struct _cef_browser_t* browser);
+  int (CEF_CALLBACK *run_modal)(struct _cef_life_span_handler_t* self,
+      struct _cef_browser_t* browser);
 
   ///
-  // Called just before a browser is destroyed. Release all references to the
-  // browser object and do not attempt to execute any functions on the browser
-  // object (other than IsValid, GetIdentifier or IsSame) after this callback
-  // returns. cef_frame_handler_t callbacks related to final main frame
-  // destruction will arrive after this callback and cef_browser_t::IsValid will
-  // return false (0) at that time. Any in-progress network requests associated
-  // with |browser| will be aborted when the browser is destroyed, and
-  // cef_resource_request_handler_t callbacks related to those requests may
-  // still arrive on the IO thread after this callback. See cef_frame_handler_t
-  // and do_close() documentation for additional usage information.
+  // Called when a window has recieved a request to close. Return false (0) to
+  // proceed with the window close or true (1) to cancel the window close. If
+  // this is a modal window and a custom modal loop implementation was provided
+  // in run_modal() this callback should be used to restore the opener window to
+  // a usable state.
   ///
-  void(CEF_CALLBACK* on_before_close)(struct _cef_life_span_handler_t* self,
-                                      struct _cef_browser_t* browser);
+  int (CEF_CALLBACK *do_close)(struct _cef_life_span_handler_t* self,
+      struct _cef_browser_t* browser);
+
+  ///
+  // Called just before a window is closed. If this is a modal window and a
+  // custom modal loop implementation was provided in run_modal() this callback
+  // should be used to exit the custom modal loop.
+  ///
+  void (CEF_CALLBACK *on_before_close)(struct _cef_life_span_handler_t* self,
+      struct _cef_browser_t* browser);
 } cef_life_span_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_load_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,92 +33,65 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=f51b6a0dbf264fa43ea3199327a5adb1044bfc04$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_frame_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Implement this structure to handle events related to browser load status. The
-// functions of this structure will be called on the browser process UI thread
-// or render process main thread (TID_RENDERER).
+// functions of this structure will be called on the UI thread.
 ///
 typedef struct _cef_load_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called when the loading state has changed. This callback will be executed
-  // twice -- once when loading is initiated either programmatically or by user
-  // action, and once when loading is terminated due to completion, cancellation
-  // of failure. It will be called before any calls to OnLoadStart and after all
-  // calls to OnLoadError and/or OnLoadEnd.
+  // Called when the browser begins loading a frame. The |frame| value will
+  // never be NULL -- call the is_main() function to check if this frame is the
+  // main frame. Multiple frames may be loading at the same time. Sub-frames may
+  // start or continue loading after the main frame load has ended. This
+  // function may not be called for a particular frame if the load request for
+  // that frame fails.
   ///
-  void(CEF_CALLBACK* on_loading_state_change)(struct _cef_load_handler_t* self,
-                                              struct _cef_browser_t* browser,
-                                              int isLoading,
-                                              int canGoBack,
-                                              int canGoForward);
-
-  ///
-  // Called after a navigation has been committed and before the browser begins
-  // loading contents in the frame. The |frame| value will never be NULL -- call
-  // the is_main() function to check if this frame is the main frame.
-  // |transition_type| provides information about the source of the navigation
-  // and an accurate value is only available in the browser process. Multiple
-  // frames may be loading at the same time. Sub-frames may start or continue
-  // loading after the main frame load has ended. This function will not be
-  // called for same page navigations (fragments, history state, etc.) or for
-  // navigations that fail or are canceled before commit. For notification of
-  // overall browser load status use OnLoadingStateChange instead.
-  ///
-  void(CEF_CALLBACK* on_load_start)(struct _cef_load_handler_t* self,
-                                    struct _cef_browser_t* browser,
-                                    struct _cef_frame_t* frame,
-                                    cef_transition_type_t transition_type);
+  void (CEF_CALLBACK *on_load_start)(struct _cef_load_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame);
 
   ///
   // Called when the browser is done loading a frame. The |frame| value will
   // never be NULL -- call the is_main() function to check if this frame is the
   // main frame. Multiple frames may be loading at the same time. Sub-frames may
   // start or continue loading after the main frame load has ended. This
-  // function will not be called for same page navigations (fragments, history
-  // state, etc.) or for navigations that fail or are canceled before commit.
-  // For notification of overall browser load status use OnLoadingStateChange
-  // instead.
+  // function will always be called for all frames irrespective of whether the
+  // request completes successfully.
   ///
-  void(CEF_CALLBACK* on_load_end)(struct _cef_load_handler_t* self,
-                                  struct _cef_browser_t* browser,
-                                  struct _cef_frame_t* frame,
-                                  int httpStatusCode);
+  void (CEF_CALLBACK *on_load_end)(struct _cef_load_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      int httpStatusCode);
 
   ///
-  // Called when a navigation fails or is canceled. This function may be called
-  // by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
-  // after commit. |errorCode| is the error code number, |errorText| is the
-  // error text and |failedUrl| is the URL that failed to load. See
+  // Called when the browser fails to load a resource. |errorCode| is the error
+  // code number and |failedUrl| is the URL that failed to load. To provide
+  // custom error text assign the text to |errorText| and return true (1).
+  // Otherwise, return false (0) for the default error text. See
   // net\base\net_error_list.h for complete descriptions of the error codes.
   ///
-  void(CEF_CALLBACK* on_load_error)(struct _cef_load_handler_t* self,
-                                    struct _cef_browser_t* browser,
-                                    struct _cef_frame_t* frame,
-                                    cef_errorcode_t errorCode,
-                                    const cef_string_t* errorText,
-                                    const cef_string_t* failedUrl);
+  int (CEF_CALLBACK *on_load_error)(struct _cef_load_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      enum cef_handler_errorcode_t errorCode, const cef_string_t* failedUrl,
+      cef_string_t* errorText);
 } cef_load_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_media_router_capi.h

@@ -1,349 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=3db7459a1940c37898699cc97f69ba9249a6f1fd$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_callback_capi.h"
-#include "include/capi/cef_registration_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-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;
-
-///
-// Supports discovery of and communication with media devices on the local
-// network via the Cast and DIAL protocols. The functions of this structure may
-// be called on any browser process thread unless otherwise indicated.
-///
-typedef struct _cef_media_router_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Add an observer for MediaRouter events. The observer will remain registered
-  // until the returned Registration object is destroyed.
-  ///
-  struct _cef_registration_t*(CEF_CALLBACK* add_observer)(
-      struct _cef_media_router_t* self,
-      struct _cef_media_observer_t* observer);
-
-  ///
-  // Returns a MediaSource object for the specified media source URN. Supported
-  // URN schemes include "cast:" and "dial:", and will be already known by the
-  // client application (e.g. "cast:<appId>?clientId=<clientId>").
-  ///
-  struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
-      struct _cef_media_router_t* self,
-      const cef_string_t* urn);
-
-  ///
-  // Trigger an asynchronous call to cef_media_observer_t::OnSinks on all
-  // registered observers.
-  ///
-  void(CEF_CALLBACK* notify_current_sinks)(struct _cef_media_router_t* self);
-
-  ///
-  // Create a new route between |source| and |sink|. Source and sink must be
-  // valid, compatible (as reported by cef_media_sink_t::IsCompatibleWith), and
-  // a route between them must not already exist. |callback| will be executed on
-  // success or failure. If route creation succeeds it will also trigger an
-  // asynchronous call to cef_media_observer_t::OnRoutes on all registered
-  // observers.
-  ///
-  void(CEF_CALLBACK* create_route)(
-      struct _cef_media_router_t* self,
-      struct _cef_media_source_t* source,
-      struct _cef_media_sink_t* sink,
-      struct _cef_media_route_create_callback_t* callback);
-
-  ///
-  // Trigger an asynchronous call to cef_media_observer_t::OnRoutes on all
-  // registered observers.
-  ///
-  void(CEF_CALLBACK* notify_current_routes)(struct _cef_media_router_t* self);
-} cef_media_router_t;
-
-///
-// Returns the MediaRouter object associated with the global request context. If
-// |callback| is non-NULL it will be executed asnychronously on the UI thread
-// after the manager's storage has been initialized. Equivalent to calling cef_r
-// equest_context_t::cef_request_context_get_global_context()->get_media_router(
-// ).
-///
-CEF_EXPORT cef_media_router_t* cef_media_router_get_global(
-    struct _cef_completion_callback_t* callback);
-
-///
-// Implemented by the client to observe MediaRouter events and registered via
-// cef_media_router_t::AddObserver. The functions of this structure will be
-// called on the browser process UI thread.
-///
-typedef struct _cef_media_observer_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // The list of available media sinks has changed or
-  // cef_media_router_t::NotifyCurrentSinks was called.
-  ///
-  void(CEF_CALLBACK* on_sinks)(struct _cef_media_observer_t* self,
-                               size_t sinksCount,
-                               struct _cef_media_sink_t* const* sinks);
-
-  ///
-  // The list of available media routes has changed or
-  // cef_media_router_t::NotifyCurrentRoutes was called.
-  ///
-  void(CEF_CALLBACK* on_routes)(struct _cef_media_observer_t* self,
-                                size_t routesCount,
-                                struct _cef_media_route_t* const* routes);
-
-  ///
-  // The connection state of |route| has changed.
-  ///
-  void(CEF_CALLBACK* on_route_state_changed)(
-      struct _cef_media_observer_t* self,
-      struct _cef_media_route_t* route,
-      cef_media_route_connection_state_t state);
-
-  ///
-  // A message was recieved over |route|. |message| is only valid for the scope
-  // of this callback and should be copied if necessary.
-  ///
-  void(CEF_CALLBACK* on_route_message_received)(
-      struct _cef_media_observer_t* self,
-      struct _cef_media_route_t* route,
-      const void* message,
-      size_t message_size);
-} cef_media_observer_t;
-
-///
-// Represents the route between a media source and sink. Instances of this
-// object are created via cef_media_router_t::CreateRoute and retrieved via
-// cef_media_observer_t::OnRoutes. Contains the status and metadata of a routing
-// operation. The functions of this structure may be called on any browser
-// process thread unless otherwise indicated.
-///
-typedef struct _cef_media_route_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns the ID for this route.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_id)(struct _cef_media_route_t* self);
-
-  ///
-  // Returns the source associated with this route.
-  ///
-  struct _cef_media_source_t*(CEF_CALLBACK* get_source)(
-      struct _cef_media_route_t* self);
-
-  ///
-  // Returns the sink associated with this route.
-  ///
-  struct _cef_media_sink_t*(CEF_CALLBACK* get_sink)(
-      struct _cef_media_route_t* self);
-
-  ///
-  // Send a message over this route. |message| will be copied if necessary.
-  ///
-  void(CEF_CALLBACK* send_route_message)(struct _cef_media_route_t* self,
-                                         const void* message,
-                                         size_t message_size);
-
-  ///
-  // Terminate this route. Will result in an asynchronous call to
-  // cef_media_observer_t::OnRoutes on all registered observers.
-  ///
-  void(CEF_CALLBACK* terminate)(struct _cef_media_route_t* self);
-} cef_media_route_t;
-
-///
-// Callback structure for cef_media_router_t::CreateRoute. The functions of this
-// structure will be called on the browser process UI thread.
-///
-typedef struct _cef_media_route_create_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Method that will be executed when the route creation has finished. |result|
-  // will be CEF_MRCR_OK if the route creation succeeded. |error| will be a
-  // description of the error if the route creation failed. |route| is the
-  // resulting route, or NULL if the route creation failed.
-  ///
-  void(CEF_CALLBACK* on_media_route_create_finished)(
-      struct _cef_media_route_create_callback_t* self,
-      cef_media_route_create_result_t result,
-      const cef_string_t* error,
-      struct _cef_media_route_t* route);
-} cef_media_route_create_callback_t;
-
-///
-// Represents a sink to which media can be routed. Instances of this object are
-// retrieved via cef_media_observer_t::OnSinks. The functions of this structure
-// may be called on any browser process thread unless otherwise indicated.
-///
-typedef struct _cef_media_sink_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns the ID for this sink.
-  ///
-  // 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 the name of this sink.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_name)(struct _cef_media_sink_t* self);
-
-  ///
-  // Returns the description of this sink.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  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.
-  ///
-  int(CEF_CALLBACK* is_cast_sink)(struct _cef_media_sink_t* self);
-
-  ///
-  // Returns true (1) if this sink accepts content via DIAL.
-  ///
-  int(CEF_CALLBACK* is_dial_sink)(struct _cef_media_sink_t* self);
-
-  ///
-  // Returns true (1) if this sink is compatible with |source|.
-  ///
-  int(CEF_CALLBACK* is_compatible_with)(struct _cef_media_sink_t* self,
-                                        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
-// structure may be called on any browser process thread unless otherwise
-// indicated.
-///
-typedef struct _cef_media_source_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns the ID (media source URN or URL) for this source.
-  ///
-  // 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 outputs its content via Cast.
-  ///
-  int(CEF_CALLBACK* is_cast_source)(struct _cef_media_source_t* self);
-
-  ///
-  // Returns true (1) if this source outputs its content via DIAL.
-  ///
-  int(CEF_CALLBACK* is_dial_source)(struct _cef_media_source_t* self);
-} cef_media_source_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_MEDIA_ROUTER_CAPI_H_

include/capi/cef_menu_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,63 +33,56 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=1bc8a73a196fbbb6cec3dd1738b817575b17706d$
-//
 
-#ifndef CEF_INCLUDE_CAPI_CEF_SSL_STATUS_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_SSL_STATUS_CAPI_H_
+#ifndef CEF_INCLUDE_CAPI_CEF_MENU_HANDLER_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_MENU_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_values_capi.h"
-#include "include/capi/cef_x509_certificate_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
-// Structure representing the SSL information for a navigation entry.
+// Implement this structure to handle events related to browser context menus.
+// The functions of this structure will be called on the UI thread.
 ///
-typedef struct _cef_sslstatus_t {
+typedef struct _cef_menu_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Returns true (1) if the status is related to a secure SSL/TLS connection.
+  // Called before a context menu is displayed. Return false (0) to display the
+  // default context menu or true (1) to cancel the display.
   ///
-  int(CEF_CALLBACK* is_secure_connection)(struct _cef_sslstatus_t* self);
+  int (CEF_CALLBACK *on_before_menu)(struct _cef_menu_handler_t* self,
+      struct _cef_browser_t* browser,
+      const struct _cef_menu_info_t* menuInfo);
 
   ///
-  // Returns a bitmask containing any and all problems verifying the server
-  // certificate.
+  // Called to optionally override the default text for a context menu item.
+  // |label| contains the default text and may be modified to substitute
+  // alternate text.
   ///
-  cef_cert_status_t(CEF_CALLBACK* get_cert_status)(
-      struct _cef_sslstatus_t* self);
+  void (CEF_CALLBACK *get_menu_label)(struct _cef_menu_handler_t* self,
+      struct _cef_browser_t* browser, enum cef_menu_id_t menuId,
+      cef_string_t* label);
 
   ///
-  // Returns the SSL version used for the SSL connection.
+  // Called when an option is selected from the default context menu. Return
+  // false (0) to execute the default action or true (1) to cancel the action.
   ///
-  cef_ssl_version_t(CEF_CALLBACK* get_sslversion)(
-      struct _cef_sslstatus_t* self);
+  int (CEF_CALLBACK *on_menu_action)(struct _cef_menu_handler_t* self,
+      struct _cef_browser_t* browser, enum cef_menu_id_t menuId);
+} cef_menu_handler_t;
 
-  ///
-  // Returns a bitmask containing the page security content status.
-  ///
-  cef_ssl_content_status_t(CEF_CALLBACK* get_content_status)(
-      struct _cef_sslstatus_t* self);
-
-  ///
-  // Returns the X.509 certificate.
-  ///
-  struct _cef_x509certificate_t*(CEF_CALLBACK* get_x509certificate)(
-      struct _cef_sslstatus_t* self);
-} cef_sslstatus_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // CEF_INCLUDE_CAPI_CEF_SSL_STATUS_CAPI_H_
+#endif  // CEF_INCLUDE_CAPI_CEF_MENU_HANDLER_CAPI_H_

include/capi/cef_menu_model_capi.h

@@ -1,511 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=9f30f2caa9eedc0d4fe963dbf0127602ffcbec61$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_menu_model_delegate_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Supports creation and modification of menus. See cef_menu_id_t for the
-// command ids that have default implementations. All user-defined command ids
-// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The functions of
-// this structure can only be accessed on the browser process the UI thread.
-///
-typedef struct _cef_menu_model_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this menu is a submenu.
-  ///
-  int(CEF_CALLBACK* is_sub_menu)(struct _cef_menu_model_t* self);
-
-  ///
-  // Clears the menu. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* clear)(struct _cef_menu_model_t* self);
-
-  ///
-  // Returns the number of items in this menu.
-  ///
-  int(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self);
-
-  ///
-  // Add a separator to the menu. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* add_separator)(struct _cef_menu_model_t* self);
-
-  ///
-  // Add an item to the menu. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* add_item)(struct _cef_menu_model_t* self,
-                              int command_id,
-                              const cef_string_t* label);
-
-  ///
-  // Add a check item to the menu. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* add_check_item)(struct _cef_menu_model_t* self,
-                                    int command_id,
-                                    const cef_string_t* label);
-
-  ///
-  // Add a radio item to the menu. Only a single item with the specified
-  // |group_id| can be checked at a time. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* add_radio_item)(struct _cef_menu_model_t* self,
-                                    int command_id,
-                                    const cef_string_t* label,
-                                    int group_id);
-
-  ///
-  // Add a sub-menu to the menu. The new sub-menu is returned.
-  ///
-  struct _cef_menu_model_t*(CEF_CALLBACK* add_sub_menu)(
-      struct _cef_menu_model_t* self,
-      int command_id,
-      const cef_string_t* label);
-
-  ///
-  // Insert a separator in the menu at the specified |index|. Returns true (1)
-  // on success.
-  ///
-  int(CEF_CALLBACK* insert_separator_at)(struct _cef_menu_model_t* self,
-                                         int index);
-
-  ///
-  // Insert an item in the menu at the specified |index|. Returns true (1) on
-  // success.
-  ///
-  int(CEF_CALLBACK* insert_item_at)(struct _cef_menu_model_t* self,
-                                    int index,
-                                    int command_id,
-                                    const cef_string_t* label);
-
-  ///
-  // Insert a check item in the menu at the specified |index|. Returns true (1)
-  // on success.
-  ///
-  int(CEF_CALLBACK* insert_check_item_at)(struct _cef_menu_model_t* self,
-                                          int index,
-                                          int command_id,
-                                          const cef_string_t* label);
-
-  ///
-  // Insert a radio item in the menu at the specified |index|. Only a single
-  // item with the specified |group_id| can be checked at a time. Returns true
-  // (1) on success.
-  ///
-  int(CEF_CALLBACK* insert_radio_item_at)(struct _cef_menu_model_t* self,
-                                          int index,
-                                          int command_id,
-                                          const cef_string_t* label,
-                                          int group_id);
-
-  ///
-  // Insert a sub-menu in the menu at the specified |index|. The new sub-menu is
-  // returned.
-  ///
-  struct _cef_menu_model_t*(CEF_CALLBACK* insert_sub_menu_at)(
-      struct _cef_menu_model_t* self,
-      int index,
-      int command_id,
-      const cef_string_t* label);
-
-  ///
-  // Removes the item with the specified |command_id|. Returns true (1) on
-  // success.
-  ///
-  int(CEF_CALLBACK* remove)(struct _cef_menu_model_t* self, int command_id);
-
-  ///
-  // Removes the item at the specified |index|. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Returns the index associated with the specified |command_id| or -1 if not
-  // found due to the command id not existing in the menu.
-  ///
-  int(CEF_CALLBACK* get_index_of)(struct _cef_menu_model_t* self,
-                                  int command_id);
-
-  ///
-  // Returns the command id at the specified |index| or -1 if not found due to
-  // invalid range or the index being a separator.
-  ///
-  int(CEF_CALLBACK* get_command_id_at)(struct _cef_menu_model_t* self,
-                                       int index);
-
-  ///
-  // Sets the command id at the specified |index|. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_command_id_at)(struct _cef_menu_model_t* self,
-                                       int index,
-                                       int command_id);
-
-  ///
-  // Returns the label for the specified |command_id| or NULL if not found.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_label)(struct _cef_menu_model_t* self,
-                                                 int command_id);
-
-  ///
-  // Returns the label at the specified |index| or NULL if not found due to
-  // invalid range or the index being a separator.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(
-      CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Sets the label for the specified |command_id|. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_label)(struct _cef_menu_model_t* self,
-                               int command_id,
-                               const cef_string_t* label);
-
-  ///
-  // Set the label at the specified |index|. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_label_at)(struct _cef_menu_model_t* self,
-                                  int index,
-                                  const cef_string_t* label);
-
-  ///
-  // Returns the item type for the specified |command_id|.
-  ///
-  cef_menu_item_type_t(CEF_CALLBACK* get_type)(struct _cef_menu_model_t* self,
-                                               int command_id);
-
-  ///
-  // Returns the item type at the specified |index|.
-  ///
-  cef_menu_item_type_t(
-      CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Returns the group id for the specified |command_id| or -1 if invalid.
-  ///
-  int(CEF_CALLBACK* get_group_id)(struct _cef_menu_model_t* self,
-                                  int command_id);
-
-  ///
-  // Returns the group id at the specified |index| or -1 if invalid.
-  ///
-  int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Sets the group id for the specified |command_id|. Returns true (1) on
-  // success.
-  ///
-  int(CEF_CALLBACK* set_group_id)(struct _cef_menu_model_t* self,
-                                  int command_id,
-                                  int group_id);
-
-  ///
-  // Sets the group id at the specified |index|. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_group_id_at)(struct _cef_menu_model_t* self,
-                                     int index,
-                                     int group_id);
-
-  ///
-  // Returns the submenu for the specified |command_id| or NULL if invalid.
-  ///
-  struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu)(
-      struct _cef_menu_model_t* self,
-      int command_id);
-
-  ///
-  // Returns the submenu at the specified |index| or NULL if invalid.
-  ///
-  struct _cef_menu_model_t*(
-      CEF_CALLBACK* get_sub_menu_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Returns true (1) if the specified |command_id| is visible.
-  ///
-  int(CEF_CALLBACK* is_visible)(struct _cef_menu_model_t* self, int command_id);
-
-  ///
-  // Returns true (1) if the specified |index| is visible.
-  ///
-  int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Change the visibility of the specified |command_id|. Returns true (1) on
-  // success.
-  ///
-  int(CEF_CALLBACK* set_visible)(struct _cef_menu_model_t* self,
-                                 int command_id,
-                                 int visible);
-
-  ///
-  // Change the visibility at the specified |index|. Returns true (1) on
-  // success.
-  ///
-  int(CEF_CALLBACK* set_visible_at)(struct _cef_menu_model_t* self,
-                                    int index,
-                                    int visible);
-
-  ///
-  // Returns true (1) if the specified |command_id| is enabled.
-  ///
-  int(CEF_CALLBACK* is_enabled)(struct _cef_menu_model_t* self, int command_id);
-
-  ///
-  // Returns true (1) if the specified |index| is enabled.
-  ///
-  int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Change the enabled status of the specified |command_id|. Returns true (1)
-  // on success.
-  ///
-  int(CEF_CALLBACK* set_enabled)(struct _cef_menu_model_t* self,
-                                 int command_id,
-                                 int enabled);
-
-  ///
-  // Change the enabled status at the specified |index|. Returns true (1) on
-  // success.
-  ///
-  int(CEF_CALLBACK* set_enabled_at)(struct _cef_menu_model_t* self,
-                                    int index,
-                                    int enabled);
-
-  ///
-  // Returns true (1) if the specified |command_id| is checked. Only applies to
-  // check and radio items.
-  ///
-  int(CEF_CALLBACK* is_checked)(struct _cef_menu_model_t* self, int command_id);
-
-  ///
-  // Returns true (1) if the specified |index| is checked. Only applies to check
-  // and radio items.
-  ///
-  int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self, int index);
-
-  ///
-  // Check the specified |command_id|. Only applies to check and radio items.
-  // Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_checked)(struct _cef_menu_model_t* self,
-                                 int command_id,
-                                 int checked);
-
-  ///
-  // Check the specified |index|. Only applies to check and radio items. Returns
-  // true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_checked_at)(struct _cef_menu_model_t* self,
-                                    int index,
-                                    int checked);
-
-  ///
-  // Returns true (1) if the specified |command_id| has a keyboard accelerator
-  // assigned.
-  ///
-  int(CEF_CALLBACK* has_accelerator)(struct _cef_menu_model_t* self,
-                                     int command_id);
-
-  ///
-  // Returns true (1) if the specified |index| has a keyboard accelerator
-  // assigned.
-  ///
-  int(CEF_CALLBACK* has_accelerator_at)(struct _cef_menu_model_t* self,
-                                        int index);
-
-  ///
-  // Set the keyboard accelerator for the specified |command_id|. |key_code| can
-  // be any virtual key or character value. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_accelerator)(struct _cef_menu_model_t* self,
-                                     int command_id,
-                                     int key_code,
-                                     int shift_pressed,
-                                     int ctrl_pressed,
-                                     int alt_pressed);
-
-  ///
-  // Set the keyboard accelerator at the specified |index|. |key_code| can be
-  // any virtual key or character value. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_accelerator_at)(struct _cef_menu_model_t* self,
-                                        int index,
-                                        int key_code,
-                                        int shift_pressed,
-                                        int ctrl_pressed,
-                                        int alt_pressed);
-
-  ///
-  // Remove the keyboard accelerator for the specified |command_id|. Returns
-  // true (1) on success.
-  ///
-  int(CEF_CALLBACK* remove_accelerator)(struct _cef_menu_model_t* self,
-                                        int command_id);
-
-  ///
-  // Remove the keyboard accelerator at the specified |index|. Returns true (1)
-  // on success.
-  ///
-  int(CEF_CALLBACK* remove_accelerator_at)(struct _cef_menu_model_t* self,
-                                           int index);
-
-  ///
-  // Retrieves the keyboard accelerator for the specified |command_id|. Returns
-  // true (1) on success.
-  ///
-  int(CEF_CALLBACK* get_accelerator)(struct _cef_menu_model_t* self,
-                                     int command_id,
-                                     int* key_code,
-                                     int* shift_pressed,
-                                     int* ctrl_pressed,
-                                     int* alt_pressed);
-
-  ///
-  // Retrieves the keyboard accelerator for the specified |index|. Returns true
-  // (1) on success.
-  ///
-  int(CEF_CALLBACK* get_accelerator_at)(struct _cef_menu_model_t* self,
-                                        int index,
-                                        int* key_code,
-                                        int* shift_pressed,
-                                        int* ctrl_pressed,
-                                        int* alt_pressed);
-
-  ///
-  // Set the explicit color for |command_id| and |color_type| to |color|.
-  // Specify a |color| value of 0 to remove the explicit color. If no explicit
-  // color or default color is set for |color_type| then the system color will
-  // be used. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_color)(struct _cef_menu_model_t* self,
-                               int command_id,
-                               cef_menu_color_type_t color_type,
-                               cef_color_t color);
-
-  ///
-  // Set the explicit color for |command_id| and |index| to |color|. Specify a
-  // |color| value of 0 to remove the explicit color. Specify an |index| value
-  // of -1 to set the default color for items that do not have an explicit color
-  // set. If no explicit color or default color is set for |color_type| then the
-  // system color will be used. Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* set_color_at)(struct _cef_menu_model_t* self,
-                                  int index,
-                                  cef_menu_color_type_t color_type,
-                                  cef_color_t color);
-
-  ///
-  // Returns in |color| the color that was explicitly set for |command_id| and
-  // |color_type|. If a color was not set then 0 will be returned in |color|.
-  // Returns true (1) on success.
-  ///
-  int(CEF_CALLBACK* get_color)(struct _cef_menu_model_t* self,
-                               int command_id,
-                               cef_menu_color_type_t color_type,
-                               cef_color_t* color);
-
-  ///
-  // Returns in |color| the color that was explicitly set for |command_id| and
-  // |color_type|. Specify an |index| value of -1 to return the default color in
-  // |color|. If a color was not set then 0 will be returned in |color|. Returns
-  // true (1) on success.
-  ///
-  int(CEF_CALLBACK* get_color_at)(struct _cef_menu_model_t* self,
-                                  int index,
-                                  cef_menu_color_type_t color_type,
-                                  cef_color_t* color);
-
-  ///
-  // Sets the font list for the specified |command_id|. If |font_list| is NULL
-  // the system font will be used. Returns true (1) on success. The format is
-  // "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a comma-
-  // separated list of font family names, - STYLES is an optional space-
-  // separated list of style names (case-sensitive
-  //   "Bold" and "Italic" are supported), and
-  // - SIZE is an integer font size in pixels with the suffix "px".
-  //
-  // Here are examples of valid font description strings: - "Arial, Helvetica,
-  // Bold Italic 14px" - "Arial, 14px"
-  ///
-  int(CEF_CALLBACK* set_font_list)(struct _cef_menu_model_t* self,
-                                   int command_id,
-                                   const cef_string_t* font_list);
-
-  ///
-  // Sets the font list for the specified |index|. Specify an |index| value of
-  // -1 to set the default font. If |font_list| is NULL the system font will be
-  // used. Returns true (1) on success. The format is
-  // "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where: - FONT_FAMILY_LIST is a comma-
-  // separated list of font family names, - STYLES is an optional space-
-  // separated list of style names (case-sensitive
-  //   "Bold" and "Italic" are supported), and
-  // - SIZE is an integer font size in pixels with the suffix "px".
-  //
-  // Here are examples of valid font description strings: - "Arial, Helvetica,
-  // Bold Italic 14px" - "Arial, 14px"
-  ///
-  int(CEF_CALLBACK* set_font_list_at)(struct _cef_menu_model_t* self,
-                                      int index,
-                                      const cef_string_t* font_list);
-} cef_menu_model_t;
-
-///
-// Create a new MenuModel with the specified |delegate|.
-///
-CEF_EXPORT cef_menu_model_t* cef_menu_model_create(
-    struct _cef_menu_model_delegate_t* delegate);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_

include/capi/cef_menu_model_delegate_capi.h

@@ -1,123 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=bdb670bcaa9eb9f5748900ad25bcc061155d6076$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _cef_menu_model_t;
-
-///
-// Implement this structure to handle menu model events. The functions of this
-// structure will be called on the browser process UI thread unless otherwise
-// indicated.
-///
-typedef struct _cef_menu_model_delegate_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Perform the action associated with the specified |command_id| and optional
-  // |event_flags|.
-  ///
-  void(CEF_CALLBACK* execute_command)(struct _cef_menu_model_delegate_t* self,
-                                      struct _cef_menu_model_t* menu_model,
-                                      int command_id,
-                                      cef_event_flags_t event_flags);
-
-  ///
-  // Called when the user moves the mouse outside the menu and over the owning
-  // window.
-  ///
-  void(CEF_CALLBACK* mouse_outside_menu)(
-      struct _cef_menu_model_delegate_t* self,
-      struct _cef_menu_model_t* menu_model,
-      const cef_point_t* screen_point);
-
-  ///
-  // Called on unhandled open submenu keyboard commands. |is_rtl| will be true
-  // (1) if the menu is displaying a right-to-left language.
-  ///
-  void(CEF_CALLBACK* unhandled_open_submenu)(
-      struct _cef_menu_model_delegate_t* self,
-      struct _cef_menu_model_t* menu_model,
-      int is_rtl);
-
-  ///
-  // Called on unhandled close submenu keyboard commands. |is_rtl| will be true
-  // (1) if the menu is displaying a right-to-left language.
-  ///
-  void(CEF_CALLBACK* unhandled_close_submenu)(
-      struct _cef_menu_model_delegate_t* self,
-      struct _cef_menu_model_t* menu_model,
-      int is_rtl);
-
-  ///
-  // The menu is about to show.
-  ///
-  void(CEF_CALLBACK* menu_will_show)(struct _cef_menu_model_delegate_t* self,
-                                     struct _cef_menu_model_t* menu_model);
-
-  ///
-  // The menu has closed.
-  ///
-  void(CEF_CALLBACK* menu_closed)(struct _cef_menu_model_delegate_t* self,
-                                  struct _cef_menu_model_t* menu_model);
-
-  ///
-  // Optionally modify a menu item label. Return true (1) if |label| was
-  // modified.
-  ///
-  int(CEF_CALLBACK* format_label)(struct _cef_menu_model_delegate_t* self,
-                                  struct _cef_menu_model_t* menu_model,
-                                  cef_string_t* label);
-} cef_menu_model_delegate_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_MENU_MODEL_DELEGATE_CAPI_H_

include/capi/cef_navigation_entry_capi.h

@@ -1,132 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=3a7dd4a6a1b5e0d9191be6c4dd2f0135f43de643$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_ssl_status_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Structure used to represent an entry in navigation history.
-///
-typedef struct _cef_navigation_entry_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this object is valid. Do not call any other functions
-  // if this function returns false (0).
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the actual URL of the page. For some pages this may be data: URL or
-  // similar. Use get_display_url() to return a display-friendly version.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_url)(
-      struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns a display-friendly version of the URL.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_display_url)(
-      struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the original URL that was entered by the user before any redirects.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_original_url)(
-      struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the title set by the page. This value may be NULL.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_title)(
-      struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the transition type which indicates what the user did to move to
-  // this page from the previous page.
-  ///
-  cef_transition_type_t(CEF_CALLBACK* get_transition_type)(
-      struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns true (1) if this navigation includes post data.
-  ///
-  int(CEF_CALLBACK* has_post_data)(struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the time for the last known successful navigation completion. A
-  // navigation may be completed more than once if the page is reloaded. May be
-  // 0 if the navigation has not yet completed.
-  ///
-  cef_time_t(CEF_CALLBACK* get_completion_time)(
-      struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the HTTP status code for the last known successful navigation
-  // response. May be 0 if the response has not yet been received or if the
-  // navigation has not yet completed.
-  ///
-  int(CEF_CALLBACK* get_http_status_code)(struct _cef_navigation_entry_t* self);
-
-  ///
-  // Returns the SSL information for this navigation entry.
-  ///
-  struct _cef_sslstatus_t*(CEF_CALLBACK* get_sslstatus)(
-      struct _cef_navigation_entry_t* self);
-} cef_navigation_entry_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_NAVIGATION_ENTRY_CAPI_H_

include/capi/cef_nplugin_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2011 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
@@ -26,24 +26,24 @@
 // 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.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
 
-#ifndef CEF_INCLUDE_CEF_I18N_UTIL_H_
-#define CEF_INCLUDE_CEF_I18N_UTIL_H_
-#pragma once
 
-#include "include/cef_base.h"
+#ifndef CEF_INCLUDE_CAPI_CEF_NPLUGIN_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_NPLUGIN_CAPI_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "include/internal/cef_nplugin_types.h"
 
 ///
-// Returns true if the application text direction is right-to-left.
+// Register a plugin with the system.  Returns true (1) on success.
 ///
-/*--cef()--*/
-bool CefIsRTL();
+CEF_EXPORT int cef_register_plugin(const cef_plugin_info_t* plugin_info);
 
-#endif  // CEF_INCLUDE_CEF_I18N_UTIL_H_
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CAPI_CEF_NPLUGIN_CAPI_H_

include/capi/cef_origin_whitelist_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,19 +33,18 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=26fdd1f18f30d9e2a48aeeb5c69607d9d22d69ca$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
 // Add an entry to the cross-origin access whitelist.
 //
@@ -68,12 +67,8 @@ extern "C" {
 // the same-origin policy. Scripts hosted underneath the fully qualified
 // |source_origin| URL (like http://www.example.com) will be allowed access to
 // all resources hosted on the specified |target_protocol| and |target_domain|.
-// If |target_domain| is non-NULL and |allow_target_subdomains| if false (0)
-// only exact domain matches will be allowed. If |target_domain| contains a top-
-// level domain component (like "example.com") and |allow_target_subdomains| is
-// true (1) sub-domain matches will be allowed. If |target_domain| is NULL and
-// |allow_target_subdomains| if true (1) all domains and IP addresses will be
-// allowed.
+// If |allow_target_subdomains| is true (1) access will also be allowed to all
+// subdomains of the target domain.
 //
 // This function cannot be used to bypass the restrictions on local or display
 // isolated schemes. See the comments on CefRegisterCustomScheme for more
@@ -83,26 +78,22 @@ extern "C" {
 // |source_origin| is invalid or the whitelist cannot be accessed.
 ///
 CEF_EXPORT int cef_add_cross_origin_whitelist_entry(
-    const cef_string_t* source_origin,
-    const cef_string_t* target_protocol,
-    const cef_string_t* target_domain,
-    int allow_target_subdomains);
+    const cef_string_t* source_origin, const cef_string_t* target_protocol,
+    const cef_string_t* target_domain, int allow_target_subdomains);
 
 ///
 // Remove an entry from the cross-origin access whitelist. Returns false (0) if
 // |source_origin| is invalid or the whitelist cannot be accessed.
 ///
 CEF_EXPORT int cef_remove_cross_origin_whitelist_entry(
-    const cef_string_t* source_origin,
-    const cef_string_t* target_protocol,
-    const cef_string_t* target_domain,
-    int allow_target_subdomains);
+    const cef_string_t* source_origin, const cef_string_t* target_protocol,
+    const cef_string_t* target_domain, int allow_target_subdomains);
 
 ///
 // Remove all entries from the cross-origin access whitelist. Returns false (0)
 // if the whitelist cannot be accessed.
 ///
-CEF_EXPORT int cef_clear_cross_origin_whitelist(void);
+CEF_EXPORT int cef_clear_cross_origin_whitelist();
 
 #ifdef __cplusplus
 }

include/capi/cef_parser_capi.h

@@ -1,176 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=f5e1c0fc43c6e85dbafa66975d9dc5e2bc7be69f$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Parse the specified |url| into its component parts. Returns false (0) if the
-// URL is NULL or invalid.
-///
-CEF_EXPORT int cef_parse_url(const cef_string_t* url,
-                             struct _cef_urlparts_t* parts);
-
-///
-// Creates a URL from the specified |parts|, which must contain a non-NULL spec
-// or a non-NULL host and path (at a minimum), but not both. Returns false (0)
-// if |parts| isn't initialized as described.
-///
-CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts,
-                              cef_string_t* url);
-
-///
-// This is a convenience function for formatting a URL in a concise and human-
-// friendly way to help users make security-related decisions (or in other
-// circumstances when people need to distinguish sites, origins, or otherwise-
-// simplified URLs from each other). Internationalized domain names (IDN) may be
-// presented in Unicode if the conversion is considered safe. The returned value
-// will (a) omit the path for standard schemes, excepting file and filesystem,
-// and (b) omit the port if it is the default for the scheme. Do not use this
-// for URLs which will be parsed or sent to other applications.
-///
-// The resulting string must be freed by calling cef_string_userfree_free().
-CEF_EXPORT cef_string_userfree_t
-cef_format_url_for_security_display(const cef_string_t* origin_url);
-
-///
-// Returns the mime type for the specified file extension or an NULL string if
-// unknown.
-///
-// The resulting string must be freed by calling cef_string_userfree_free().
-CEF_EXPORT cef_string_userfree_t
-cef_get_mime_type(const cef_string_t* extension);
-
-///
-// Get the extensions associated with the given mime type. This should be passed
-// in lower case. There could be multiple extensions for a given mime type, like
-// "html,htm" for "text/html", or "txt,text,html,..." for "text/*". Any existing
-// elements in the provided vector will not be erased.
-///
-CEF_EXPORT void cef_get_extensions_for_mime_type(const cef_string_t* mime_type,
-                                                 cef_string_list_t extensions);
-
-///
-// Encodes |data| as a base64 string.
-///
-// The resulting string must be freed by calling cef_string_userfree_free().
-CEF_EXPORT cef_string_userfree_t cef_base64encode(const void* data,
-                                                  size_t data_size);
-
-///
-// Decodes the base64 encoded string |data|. The returned value will be NULL if
-// the decoding fails.
-///
-CEF_EXPORT struct _cef_binary_value_t* cef_base64decode(
-    const cef_string_t* data);
-
-///
-// Escapes characters in |text| which are unsuitable for use as a query
-// parameter value. Everything except alphanumerics and -_.!~*'() will be
-// converted to "%XX". If |use_plus| is true (1) spaces will change to "+". The
-// result is basically the same as encodeURIComponent in Javacript.
-///
-// The resulting string must be freed by calling cef_string_userfree_free().
-CEF_EXPORT cef_string_userfree_t cef_uriencode(const cef_string_t* text,
-                                               int use_plus);
-
-///
-// Unescapes |text| and returns the result. Unescaping consists of looking for
-// the exact pattern "%XX" where each X is a hex digit and converting to the
-// character with the numerical value of those digits (e.g. "i%20=%203%3b"
-// unescapes to "i = 3;"). If |convert_to_utf8| is true (1) this function will
-// attempt to interpret the initial decoded result as UTF-8. If the result is
-// convertable into UTF-8 it will be returned as converted. Otherwise the
-// initial decoded result will be returned.  The |unescape_rule| parameter
-// supports further customization the decoding process.
-///
-// The resulting string must be freed by calling cef_string_userfree_free().
-CEF_EXPORT cef_string_userfree_t
-cef_uridecode(const cef_string_t* text,
-              int convert_to_utf8,
-              cef_uri_unescape_rule_t unescape_rule);
-
-///
-// Parses the specified |json_string| and returns a dictionary or list
-// representation. If JSON parsing fails this function returns NULL.
-///
-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.
-///
-CEF_EXPORT struct _cef_value_t* cef_parse_jsonand_return_error(
-    const cef_string_t* json_string,
-    cef_json_parser_options_t options,
-    cef_string_t* error_msg_out);
-
-///
-// Generates a JSON string from the specified root |node| which should be a
-// dictionary or list value. Returns an NULL string on failure. This function
-// requires exclusive access to |node| including any underlying data.
-///
-// The resulting string must be freed by calling cef_string_userfree_free().
-CEF_EXPORT cef_string_userfree_t
-cef_write_json(struct _cef_value_t* node, cef_json_writer_options_t options);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_

include/capi/cef_path_util_capi.h

@@ -1,59 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=41ddd04d4efb147b05eb93816af1591ec3b61b76$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Retrieve the path associated with the specified |key|. Returns true (1) on
-// success. Can be called on any thread in the browser process.
-///
-CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_

include/capi/cef_permission_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,44 +33,40 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=01a33de48ac9780f78d606d8aee2429ddb0c81a2$
-//
 
-#ifndef CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
+#ifndef CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_
+#define CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "include/capi/cef_base_capi.h"
+
+
 ///
-// Callback structure used for asynchronous continuation of authentication
-// requests.
+// Implement this structure to handle events related to browser permissions. The
+// functions of this structure will be called on the UI thread.
 ///
-typedef struct _cef_auth_callback_t {
+typedef struct _cef_permission_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Continue the authentication request.
+  // Called on the UI thread before a script extension is loaded. Return false
+  // (0) to let the extension load normally.
   ///
-  void(CEF_CALLBACK* cont)(struct _cef_auth_callback_t* self,
-                           const cef_string_t* username,
-                           const cef_string_t* password);
+  int (CEF_CALLBACK *on_before_script_extension_load)(
+      struct _cef_permission_handler_t* self, struct _cef_browser_t* browser,
+      struct _cef_frame_t* frame, const cef_string_t* extensionName);
+} cef_permission_handler_t;
 
-  ///
-  // Cancel the authentication request.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_auth_callback_t* self);
-} cef_auth_callback_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
+#endif  // CEF_INCLUDE_CAPI_CEF_PERMISSION_HANDLER_CAPI_H_

include/capi/cef_print_handler_capi.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 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,125 +33,62 @@
 // by hand. See the translator.README.txt file in the tools directory for
 // more information.
 //
-// $hash=e26be3efc18d8c79d019c02b1d73a7ec2866b142$
-//
 
 #ifndef CEF_INCLUDE_CAPI_CEF_PRINT_HANDLER_CAPI_H_
 #define CEF_INCLUDE_CAPI_CEF_PRINT_HANDLER_CAPI_H_
 #pragma once
 
-#include "include/capi/cef_base_capi.h"
-#include "include/capi/cef_browser_capi.h"
-#include "include/capi/cef_print_settings_capi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-///
-// Callback structure for asynchronous continuation of print dialog requests.
-///
-typedef struct _cef_print_dialog_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
+#include "include/capi/cef_base_capi.h"
 
-  ///
-  // Continue printing with the specified |settings|.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_print_dialog_callback_t* self,
-                           struct _cef_print_settings_t* settings);
-
-  ///
-  // Cancel the printing.
-  ///
-  void(CEF_CALLBACK* cancel)(struct _cef_print_dialog_callback_t* self);
-} cef_print_dialog_callback_t;
 
 ///
-// Callback structure for asynchronous continuation of print job requests.
-///
-typedef struct _cef_print_job_callback_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Indicate completion of the print job.
-  ///
-  void(CEF_CALLBACK* cont)(struct _cef_print_job_callback_t* self);
-} cef_print_job_callback_t;
-
-///
-// Implement this structure to handle printing on Linux. Each browser will have
-// only one print job in progress at a time. The functions of this structure
-// will be called on the browser process UI thread.
+// Implement this structure to handle events related to printing. The functions
+// of this structure will be called on the UI thread.
 ///
 typedef struct _cef_print_handler_t {
   ///
   // Base structure.
   ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;
 
   ///
-  // Called when printing has started for the specified |browser|. This function
-  // will be called before the other OnPrint*() functions and irrespective of
-  // how printing was initiated (e.g. cef_browser_host_t::print(), JavaScript
-  // window.print() or PDF extension print button).
+  // Called to allow customization of standard print options before the print
+  // dialog is displayed. |printOptions| allows specification of paper size,
+  // orientation and margins. Note that the specified margins may be adjusted if
+  // they are outside the range supported by the printer. All units are in
+  // inches. Return false (0) to display the default print options or true (1)
+  // to display the modified |printOptions|.
   ///
-  void(CEF_CALLBACK* on_print_start)(struct _cef_print_handler_t* self,
-                                     struct _cef_browser_t* browser);
-
-  ///
-  // Synchronize |settings| with client state. If |get_defaults| is true (1)
-  // then populate |settings| with the default print settings. Do not keep a
-  // reference to |settings| outside of this callback.
-  ///
-  void(CEF_CALLBACK* on_print_settings)(struct _cef_print_handler_t* self,
-                                        struct _cef_browser_t* browser,
-                                        struct _cef_print_settings_t* settings,
-                                        int get_defaults);
-
-  ///
-  // Show the print dialog. Execute |callback| once the dialog is dismissed.
-  // Return true (1) if the dialog will be displayed or false (0) to cancel the
-  // printing immediately.
-  ///
-  int(CEF_CALLBACK* on_print_dialog)(
-      struct _cef_print_handler_t* self,
+  int (CEF_CALLBACK *get_print_options)(struct _cef_print_handler_t* self,
       struct _cef_browser_t* browser,
-      int has_selection,
-      struct _cef_print_dialog_callback_t* callback);
+      struct _cef_print_options_t* printOptions);
 
   ///
-  // Send the print job to the printer. Execute |callback| once the job is
-  // completed. Return true (1) if the job will proceed or false (0) to cancel
-  // the job immediately.
+  // Called to format print headers and footers. |printInfo| contains platform-
+  // specific information about the printer context. |url| is the URL if the
+  // currently printing page, |title| is the title of the currently printing
+  // page, |currentPage| is the current page number and |maxPages| is the total
+  // number of pages. Six default header locations are provided by the
+  // implementation: top left, top center, top right, bottom left, bottom center
+  // and bottom right. To use one of these default locations just assign a
+  // string to the appropriate variable. To draw the header and footer yourself
+  // return true (1). Otherwise, populate the approprate variables and return
+  // false (0).
   ///
-  int(CEF_CALLBACK* on_print_job)(struct _cef_print_handler_t* self,
-                                  struct _cef_browser_t* browser,
-                                  const cef_string_t* document_name,
-                                  const cef_string_t* pdf_file_path,
-                                  struct _cef_print_job_callback_t* callback);
-
-  ///
-  // Reset client state related to printing.
-  ///
-  void(CEF_CALLBACK* on_print_reset)(struct _cef_print_handler_t* self,
-                                     struct _cef_browser_t* browser);
-
-  ///
-  // Return the PDF paper size in device units. Used in combination with
-  // cef_browser_host_t::print_to_pdf().
-  ///
-  cef_size_t(CEF_CALLBACK* get_pdf_paper_size)(
-      struct _cef_print_handler_t* self,
-      struct _cef_browser_t* browser,
-      int device_units_per_inch);
+  int (CEF_CALLBACK *get_print_header_footer)(struct _cef_print_handler_t* self,
+      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
+      const struct _cef_print_info_t* printInfo, const cef_string_t* url,
+      const cef_string_t* title, int currentPage, int maxPages,
+      cef_string_t* topLeft, cef_string_t* topCenter, cef_string_t* topRight,
+      cef_string_t* bottomLeft, cef_string_t* bottomCenter,
+      cef_string_t* bottomRight);
 } cef_print_handler_t;
 
+
 #ifdef __cplusplus
 }
 #endif

include/capi/cef_print_settings_capi.h

@@ -1,202 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=1a9b9718367ec8d575fbb39b73b1085b17eb0a2b$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Structure representing print settings.
-///
-typedef struct _cef_print_settings_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_ref_counted_t base;
-
-  ///
-  // Returns true (1) if this object is valid. Do not call any other functions
-  // if this function returns false (0).
-  ///
-  int(CEF_CALLBACK* is_valid)(struct _cef_print_settings_t* self);
-
-  ///
-  // Returns true (1) if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
-  ///
-  int(CEF_CALLBACK* is_read_only)(struct _cef_print_settings_t* self);
-
-  ///
-  // Set the page orientation.
-  ///
-  void(CEF_CALLBACK* set_orientation)(struct _cef_print_settings_t* self,
-                                      int landscape);
-
-  ///
-  // Returns true (1) if the orientation is landscape.
-  ///
-  int(CEF_CALLBACK* is_landscape)(struct _cef_print_settings_t* self);
-
-  ///
-  // Set the printer printable area in device units. Some platforms already
-  // provide flipped area. Set |landscape_needs_flip| to false (0) on those
-  // platforms to avoid double flipping.
-  ///
-  void(CEF_CALLBACK* set_printer_printable_area)(
-      struct _cef_print_settings_t* self,
-      const cef_size_t* physical_size_device_units,
-      const cef_rect_t* printable_area_device_units,
-      int landscape_needs_flip);
-
-  ///
-  // Set the device name.
-  ///
-  void(CEF_CALLBACK* set_device_name)(struct _cef_print_settings_t* self,
-                                      const cef_string_t* name);
-
-  ///
-  // Get the device name.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t(CEF_CALLBACK* get_device_name)(
-      struct _cef_print_settings_t* self);
-
-  ///
-  // Set the DPI (dots per inch).
-  ///
-  void(CEF_CALLBACK* set_dpi)(struct _cef_print_settings_t* self, int dpi);
-
-  ///
-  // Get the DPI (dots per inch).
-  ///
-  int(CEF_CALLBACK* get_dpi)(struct _cef_print_settings_t* self);
-
-  ///
-  // Set the page ranges.
-  ///
-  void(CEF_CALLBACK* set_page_ranges)(struct _cef_print_settings_t* self,
-                                      size_t rangesCount,
-                                      cef_range_t const* ranges);
-
-  ///
-  // Returns the number of page ranges that currently exist.
-  ///
-  size_t(CEF_CALLBACK* get_page_ranges_count)(
-      struct _cef_print_settings_t* self);
-
-  ///
-  // Retrieve the page ranges.
-  ///
-  void(CEF_CALLBACK* get_page_ranges)(struct _cef_print_settings_t* self,
-                                      size_t* rangesCount,
-                                      cef_range_t* ranges);
-
-  ///
-  // Set whether only the selection will be printed.
-  ///
-  void(CEF_CALLBACK* set_selection_only)(struct _cef_print_settings_t* self,
-                                         int selection_only);
-
-  ///
-  // Returns true (1) if only the selection will be printed.
-  ///
-  int(CEF_CALLBACK* is_selection_only)(struct _cef_print_settings_t* self);
-
-  ///
-  // Set whether pages will be collated.
-  ///
-  void(CEF_CALLBACK* set_collate)(struct _cef_print_settings_t* self,
-                                  int collate);
-
-  ///
-  // Returns true (1) if pages will be collated.
-  ///
-  int(CEF_CALLBACK* will_collate)(struct _cef_print_settings_t* self);
-
-  ///
-  // Set the color model.
-  ///
-  void(CEF_CALLBACK* set_color_model)(struct _cef_print_settings_t* self,
-                                      cef_color_model_t model);
-
-  ///
-  // Get the color model.
-  ///
-  cef_color_model_t(CEF_CALLBACK* get_color_model)(
-      struct _cef_print_settings_t* self);
-
-  ///
-  // Set the number of copies.
-  ///
-  void(CEF_CALLBACK* set_copies)(struct _cef_print_settings_t* self,
-                                 int copies);
-
-  ///
-  // Get the number of copies.
-  ///
-  int(CEF_CALLBACK* get_copies)(struct _cef_print_settings_t* self);
-
-  ///
-  // Set the duplex mode.
-  ///
-  void(CEF_CALLBACK* set_duplex_mode)(struct _cef_print_settings_t* self,
-                                      cef_duplex_mode_t mode);
-
-  ///
-  // Get the duplex mode.
-  ///
-  cef_duplex_mode_t(CEF_CALLBACK* get_duplex_mode)(
-      struct _cef_print_settings_t* self);
-} cef_print_settings_t;
-
-///
-// Create a new cef_print_settings_t object.
-///
-CEF_EXPORT cef_print_settings_t* cef_print_settings_create(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_PRINT_SETTINGS_CAPI_H_

include/capi/cef_process_util_capi.h

@@ -1,65 +0,0 @@
-// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool and should not edited
-// by hand. See the translator.README.txt file in the tools directory for
-// more information.
-//
-// $hash=1f2b752c4e314b240ce95cb3b87863c2f99534a8$
-//
-
-#ifndef CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_
-#define CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_
-#pragma once
-
-#include "include/capi/cef_base_capi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///
-// Launches the process specified via |command_line|. Returns true (1) upon
-// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread.
-//
-// Unix-specific notes: - All file descriptors open in the parent process will
-// be closed in the
-//   child process except for stdin, stdout, and stderr.
-// - If the first argument on the command line does not contain a slash,
-//   PATH will be searched. (See man execvp.)
-///
-CEF_EXPORT int cef_launch_process(struct _cef_command_line_t* command_line);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_