Windows: Fix command line parsing for crash handler (issue #1995 )

Fix command line parsing for crash handler (issue #1995 )
Standardize product/version/platform crash keys (issue #1995 )
2025-06-05 21:39:12 +02:00 · 2017-01-30 16:18:58 -05:00 · 2017-01-27 14:22:17 -05:00 · 2017-01-25 14:18:49 -05:00 · 2017-01-25 12:48:33 -05:00 · 2017-01-24 18:16:56 -05:00
1029 changed files with 17392 additions and 20898 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -99,12 +99,8 @@ import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//cef/cef_repack_locales.gni")
-import("//chrome/common/features.gni")
-import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
-import("//ppapi/features/features.gni")
-import("//printing/features/features.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 import("//tools/grit/repack.gni")
@@ -118,8 +114,8 @@ if (is_linux) {
 }
 if (is_mac) {
  import("//build/config/mac/rules.gni")
+  import("//build_overrides/v8.gni")
  import("//build/mac/tweak_info_plist.gni")
-  import("//build/util/version.gni")
  import("//media/cdm/ppapi/cdm_paths.gni")
 }
 if (is_win) {
@@ -164,45 +160,8 @@ if (is_mac) {
 #

 if (is_mac) {
-  cef_commit_number = exec_script(
-    "//cef/tools/commit_number.py",
-    [ rebase_path("//cef", root_build_dir) ],
-    "trim string", [])
-
-  cef_version_file = "//cef/VERSION"
-
-  # The tweak_info_plist.py script requires a version number with 4 parts. CEF
-  # uses a version number with 3 parts so just set the last part to 0.
-  cef_plist_version = exec_script(
-    "//build/util/version.py",
-    [
-      "-f",
-      rebase_path(cef_version_file, root_build_dir),
-      "-f",
-      rebase_path(chrome_version_file, root_build_dir),
-      "-t",
-      "@CEF_MAJOR@.@BUILD@.${cef_commit_number}.0",
-    ],
-    "trim string",
-    [ cef_version_file, chrome_version_file ])
-
-  # Need to be creative to match dylib version formatting requirements.
-  cef_dylib_version = exec_script(
-    "//build/util/version.py",
-    [
-      "-f",
-      rebase_path(cef_version_file, root_build_dir),
-      "-f",
-      rebase_path(chrome_version_file, root_build_dir),
-      "-t",
-      "@CEF_MAJOR@${cef_commit_number}.@BUILD_HI@.@BUILD_LO@",
-      "-e",
-      "BUILD_HI=int(BUILD)/256",
-      "-e",
-      "BUILD_LO=int(BUILD)%256",
-    ],
-    "trim string",
-    [ cef_version_file, chrome_version_file ])
+  # TODO(cef): Generate this value using version.py.
+  cef_version = "99.77.34.5"
 }

 # Read file lists from gypi files. The gypi_to_gn.py script does not support
@@ -359,10 +318,10 @@ static_library("libcef_static") {
    "libcef/browser/net/network_delegate.h",
    "libcef/browser/net/resource_request_job.cc",
    "libcef/browser/net/resource_request_job.h",
+    "libcef/browser/net/response_filter_wrapper.cc",
+    "libcef/browser/net/response_filter_wrapper.h",
    "libcef/browser/net/scheme_handler.cc",
    "libcef/browser/net/scheme_handler.h",
-    "libcef/browser/net/source_stream.cc",
-    "libcef/browser/net/source_stream.h",
    "libcef/browser/net/url_request_context.cc",
    "libcef/browser/net/url_request_context.h",
    "libcef/browser/net/url_request_context_getter.h",
@@ -656,13 +615,12 @@ static_library("libcef_static") {
    "//content/public/renderer",
    "//content/public/utility",
    "//crypto",
-    "//device/base",
+    "//device/core",
    "//device/geolocation",
    "//device/hid",
    "//extensions/browser",
-    "//extensions/browser/api:api_registration",
    "//extensions/common/api",
-    "//extensions/features",
+    "//extensions/common/api:api_registration",
    "//extensions/renderer",
    "//extensions/utility",
    "//gpu",
@@ -671,20 +629,17 @@ static_library("libcef_static") {
    "//media/blink",
    "//net",
    "//net:net_browser_services",
-    "//net:net_utility_services",
    "//net:net_with_v8",
    "//pdf",
-    "//ppapi/features",
-    "//printing/features",
    "//skia",
    "//storage/browser",
-    "//third_party/brotli:dec",
+    "//third_party/brotli",
    "//third_party/cld",
    "//third_party/hunspell",
    "//third_party/leveldatabase",
    "//third_party/libxml",
    "//third_party/WebKit/public:blink",
-    "//third_party/widevine/cdm:headers",
+    "//third_party/widevine/cdm:version_h",
    "//third_party/icu",
    "//third_party/zlib:minizip",
    "//ui/base",
@@ -726,10 +681,8 @@ static_library("libcef_static") {
      "libcef/browser/osr/render_widget_host_view_osr_win.cc",
      "libcef/common/crash_reporting_win.cc",
      "libcef/common/crash_reporting_win.h",
-
-      # Part of //chrome/utility.
-      "//chrome/utility/printing_handler.cc",
-      "//chrome/utility/printing_handler.h",
+      "libcef/utility/printing_handler.cc",
+      "libcef/utility/printing_handler.h",
    ]

    deps += [
@@ -754,7 +707,7 @@ static_library("libcef_static") {

    deps += [
      "//build/linux:fontconfig",
-      "//build/linux:freetype2",
+      "//third_party/freetype2",
    ]
  }

@@ -1024,7 +977,7 @@ repack("pak_devtools") {
  # Each input pak file should also have a deps line for completeness.
  # Add associated .h files in the make_pack_header("resources") target.
  sources = [
-    "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
+    "$root_gen_dir/blink/devtools_resources.pak",
  ]

  # Use public_deps so that generated grit headers are discoverable from
@@ -1162,6 +1115,7 @@ template("make_pack_header") {
 make_pack_header("resources") {
  header = "$root_out_dir/includes/include/cef_pack_resources.h"
  inputs = [
+    "$root_gen_dir/blink/grit/devtools_resources.h",
    "$root_gen_dir/blink/public/resources/grit/blink_image_resources.h",
    "$root_gen_dir/blink/public/resources/grit/blink_resources.h",
    "$root_gen_dir/cef/grit/cef_resources.h",
@@ -1171,7 +1125,6 @@ make_pack_header("resources") {
    "$root_gen_dir/chrome/grit/net_internals_resources.h",
    "$root_gen_dir/chrome/grit/renderer_resources.h",
    "$root_gen_dir/components/grit/components_resources.h",
-    "$root_gen_dir/content/browser/devtools/grit/devtools_resources.h",
    "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
    "$root_gen_dir/content/grit/content_resources.h",
    "$root_gen_dir/extensions/grit/extensions_browser_resources.h",
@@ -1215,7 +1168,7 @@ if (is_mac) {
      "--keystone=0",
      "--scm=1",
      "--version",
-      cef_plist_version,
+      cef_version,
      "--branding",
      cef_framework_name,
    ]
@@ -1302,13 +1255,7 @@ if (is_mac) {
    # on one of the executables. However install_name_tool only operates
    # in-place, which is problematic to express in GN. Instead, use rpath-based
    # loading.
-    ldflags = [
-      "-Wl,-install_name,@rpath/Frameworks/$output_name.framework/$output_name",
-      "-compatibility_version",
-      cef_dylib_version,
-      "-current_version",
-      cef_dylib_version,
-    ]
+    ldflags = [ "-Wl,-install_name,@rpath/Frameworks/$output_name.framework/$output_name" ]

    if (is_component_build) {
      # Set up the rpath for the framework so that it can find dylibs in the
@@ -1388,7 +1335,7 @@ if (is_mac) {
        "--keystone=0",
        "--scm=0",
        "--version",
-        cef_plist_version,
+        cef_version,
      ]
    }

@@ -1439,7 +1386,7 @@ if (is_mac) {
      args = [
        "--scm=1",
        "--version",
-        cef_plist_version,
+        cef_version,
      ]
    }

--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

 {
-  'chromium_checkout': 'refs/tags/58.0.3029.81',
+  'chromium_checkout': 'refs/tags/55.0.2883.87',
 }
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -48,13 +48,13 @@
 #     libgtkglext1-dev  (required by the cefclient target only)
 #
 # - Mac OS X requirements:
-#   Xcode 5 or newer building on Mac OS X 10.9 (Mavericks) or newer. Xcode 8.3
-#   and OS X 10.12 are recommended. The Xcode command-line tools must also be
+#   Xcode 5 or newer building on Mac OS X 10.9 (Mavericks) or newer. Xcode 7.2
+#   and OS X 10.11 are recommended. The Xcode command-line tools must also be
 #   installed. Only 64-bit builds are supported on OS X.
 #
 # - Windows requirements:
 #   Visual Studio 2010 or newer building on Windows 7 or newer. Visual Studio
-#   2015 Update 3 and Windows 10 64-bit are recommended.
+#   2015 Update 2 and Windows 10 64-bit are recommended.
 #
 # BUILD EXAMPLES
 #
--- a/README.md
+++ b/README.md
@@ -47,8 +47,7 @@ The base CEF framework includes support for the C and C++ programming languages.
 * .Net/Mono (CEF3) - https://bitbucket.org/xilium/xilium.cefglue
 * .Net (CEF3) - https://bitbucket.org/chromiumfx/chromiumfx
 * Delphi (CEF1) - http://code.google.com/p/delphichromiumembedded/
-* Delphi (CEF3) - https://github.com/hgourvest/dcef3
-* Delphi (CEF3) - https://github.com/salvadordf/CEF4Delphi
+* Delphi (CEF3) - http://code.google.com/p/dcef3/
 * Go - https://github.com/CzarekTomczak/cef2go
 * Java - https://bitbucket.org/chromiumembedded/java-cef
 * Java - http://code.google.com/p/javacef/
--- a/cef_paths.gypi
+++ b/cef_paths.gypi
@@ -390,26 +390,16 @@
      '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/ctocpp/test/translator_test_handler_ctocpp.cc',
+      'libcef_dll/ctocpp/test/translator_test_handler_ctocpp.h',
+      'libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.cc',
+      'libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.h',
+      'libcef_dll/cpptoc/test/translator_test_object_cpptoc.cc',
+      'libcef_dll/cpptoc/test/translator_test_object_cpptoc.h',
+      'libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.cc',
+      'libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h',
+      'libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.cc',
+      'libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h',
      'libcef_dll/cpptoc/urlrequest_cpptoc.cc',
      'libcef_dll/cpptoc/urlrequest_cpptoc.h',
      'libcef_dll/ctocpp/urlrequest_client_ctocpp.cc',
@@ -662,26 +652,16 @@
      '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/cpptoc/test/translator_test_handler_cpptoc.cc',
+      'libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h',
+      'libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.cc',
+      'libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h',
+      'libcef_dll/ctocpp/test/translator_test_object_ctocpp.cc',
+      'libcef_dll/ctocpp/test/translator_test_object_ctocpp.h',
+      'libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.cc',
+      'libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.h',
+      'libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.cc',
+      'libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.h',
      'libcef_dll/ctocpp/urlrequest_ctocpp.cc',
      'libcef_dll/ctocpp/urlrequest_ctocpp.h',
      'libcef_dll/cpptoc/urlrequest_client_cpptoc.cc',
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -88,17 +88,12 @@
      '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/cpptoc/cpptoc.h',
+      'libcef_dll/ctocpp/base_ctocpp.cc',
+      'libcef_dll/ctocpp/base_ctocpp.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/transfer_util.cc',
      'libcef_dll/transfer_util.h',
@@ -119,15 +114,10 @@
      'libcef_dll/base/cef_weak_ptr.cc',
    ],
    '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/ptr_util.h',
+      'libcef_dll/cpptoc/base_cpptoc.cc',
+      'libcef_dll/cpptoc/base_cpptoc.h',
+      'libcef_dll/cpptoc/cpptoc.h',
+      'libcef_dll/ctocpp/ctocpp.h',
      'libcef_dll/transfer_util.cc',
      'libcef_dll/transfer_util.h',
      'libcef_dll/wrapper_types.h',
@@ -299,10 +289,6 @@
      'tests/cefclient/browser/root_window_win.h',
      'tests/cefclient/browser/temp_window_win.cc',
      'tests/cefclient/browser/temp_window_win.h',
-      'tests/cefclient/browser/views_menu_bar.cc',
-      'tests/cefclient/browser/views_menu_bar.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_runner_views.cc',
@@ -354,10 +340,6 @@
      'tests/cefclient/browser/root_window_views.h',
      'tests/cefclient/browser/temp_window_x11.cc',
      'tests/cefclient/browser/temp_window_x11.h',
-      'tests/cefclient/browser/views_menu_bar.cc',
-      'tests/cefclient/browser/views_menu_bar.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_runner_gtk.cc',
--- a/cmake/cef_macros.cmake.in
+++ b/cmake/cef_macros.cmake.in
@@ -19,7 +19,7 @@ macro(PRINT_CEF_CONFIG)
  message(STATUS "Platform:                     ${CMAKE_SYSTEM_NAME}")
  message(STATUS "Project architecture:         ${PROJECT_ARCH}")

-  if(GEN_NINJA OR GEN_MAKEFILES)
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
    message(STATUS "Build type:                   ${CMAKE_BUILD_TYPE}")
  endif()

@@ -81,7 +81,8 @@ endmacro()

 # Determine the target output directory based on platform and generator.
 macro(SET_CEF_TARGET_OUT_DIR)
-  if(GEN_NINJA OR GEN_MAKEFILES)
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR
+     ${CMAKE_GENERATOR} STREQUAL "Unix 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}")
@@ -275,17 +276,17 @@ endmacro()
 # 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}>)
+  target_compile_options(${target} PUBLIC ${CEF_COMPILER_FLAGS} ${CEF_CXX_COMPILER_FLAGS})
+  target_compile_options(${target} PUBLIC $<$<CONFIG:Debug>:${CEF_COMPILER_FLAGS_DEBUG} ${CEF_CXX_COMPILER_FLAGS_DEBUG}>)
+  target_compile_options(${target} PUBLIC $<$<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}>)
+  target_compile_definitions(${target} PUBLIC ${CEF_COMPILER_DEFINES})
+  target_compile_definitions(${target} PUBLIC $<$<CONFIG:Debug>:${CEF_COMPILER_DEFINES_DEBUG}>)
+  target_compile_definitions(${target} PUBLIC $<$<CONFIG:Release>:${CEF_COMPILER_DEFINES_RELEASE}>)

  # Include directories.
-  target_include_directories(${target} PRIVATE ${CEF_INCLUDE_PATH})
+  target_include_directories(${target} PUBLIC ${CEF_INCLUDE_PATH})

  # Linker flags.
  if(CEF_LINKER_FLAGS)
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -37,14 +37,9 @@ if(NOT DEFINED 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))
+if(NOT CMAKE_BUILD_TYPE AND
+   (${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix 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}")
@@ -220,7 +215,7 @@ endif()

 if(OS_MACOSX)
  # Platform-specific compiler/linker flags.
-  # See also Xcode target properties in cef_macros.cmake.
+  # See also Xcode target properties in macros.cmake.
  set(CEF_LIBTYPE SHARED)
  list(APPEND CEF_COMPILER_FLAGS
    -fno-strict-aliasing            # Avoid assumptions regarding non-aliasing of objects of different types
@@ -264,15 +259,6 @@ if(OS_MACOSX)
    -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
@@ -282,7 +268,7 @@ if(OS_MACOSX)

  # 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.11 10.10 10.9)
+  foreach(OS_VERSION 10.10 10.9 10.8 10.7)
    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})
@@ -290,7 +276,7 @@ if(OS_MACOSX)
  endforeach()

  # Target SDK.
-  set(CEF_TARGET_SDK               "10.9")
+  set(CEF_TARGET_SDK               "10.7")
  list(APPEND CEF_COMPILER_FLAGS
    -mmacosx-version-min=${CEF_TARGET_SDK}
  )
@@ -319,14 +305,6 @@ endif()
 #

 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()
-
  # Configure use of the sandbox.
  option(USE_SANDBOX "Enable or disable use of the sandbox." ON)
  if(USE_SANDBOX AND NOT MSVC_VERSION EQUAL 1900)
@@ -372,13 +350,8 @@ if(OS_WINDOWS)
    # defaults here.
    set(CMAKE_CXX_FLAGS_DEBUG "")

-    # These flags are required to successfully link and run applications using
-    # the sandbox library.
    list(APPEND CEF_COMPILER_FLAGS_DEBUG
      /MT           # Multithreaded release runtime
-      /O2           # Maximize speed optimization
-      /Zc:inline    # Remove unreferenced functions or data
-      /Oy-          # Disable frame-pointer omission
      )
  else()
    list(APPEND CEF_COMPILER_FLAGS_DEBUG
@@ -403,7 +376,7 @@ if(OS_WINDOWS)
  list(APPEND CEF_COMPILER_DEFINES
    WIN32 _WIN32 _WINDOWS             # Windows platform
    UNICODE _UNICODE                  # Unicode build
-    WINVER=0x0601 _WIN32_WINNT=0x601  # Targeting Windows 7
+    WINVER=0x0602 _WIN32_WINNT=0x602  # Targeting Windows 8
    NOMINMAX                          # Use the standard's templated min/max
    WIN32_LEAN_AND_MEAN               # Exclude less common API declarations
    _HAS_EXCEPTIONS=0                 # Disable exceptions
@@ -481,19 +454,10 @@ if(OS_WINDOWS)
  # Configure use of ATL.
  option(USE_ATL "Enable or disable use of ATL." ON)
  if(USE_ATL)
-    # Locate the VC directory. The cl.exe path returned by CMAKE_CXX_COMPILER
-    # may be at different directory depths depending on the toolchain version
-    # (e.g. "VC/bin/cl.exe", "VC/bin/amd64_x86/cl.exe", etc).
-    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)
-      get_filename_component(VC_DIR_NAME ${VC_DIR} NAME)
-    endwhile()
-
    # Determine if the Visual Studio install supports ATL.
+    get_filename_component(VC_BIN_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
+    get_filename_component(VC_DIR ${VC_BIN_DIR} DIRECTORY)
    if(NOT IS_DIRECTORY "${VC_DIR}/atlmfc")
-      message(WARNING "ATL is not supported by your VC installation.")
      set(USE_ATL OFF)
    endif()
  endif()
--- a/include/base/cef_build.h
+++ b/include/base/cef_build.h
@@ -189,13 +189,4 @@
 #endif
 #endif  // OVERRIDE

-// Check for C++11 template alias support which was added in VS2013 and GCC4.7.
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
-#if __cplusplus > 199711L || \
-    (defined(_MSC_VER) && _MSC_VER >= 1800) || \
-    (defined(__GNUC__) && \
-      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
-#define HAS_CPP11_TEMPLATE_ALIAS_SUPPORT
-#endif
-
 #endif  // CEF_INCLUDE_BASE_CEF_BUILD_H_
--- a/include/capi/cef_app_capi.h
+++ b/include/capi/cef_app_capi.h
@@ -59,7 +59,7 @@ typedef struct _cef_app_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Provides an opportunity to view and/or modify command-line arguments before
--- a/include/capi/cef_auth_callback_capi.h
+++ b/include/capi/cef_auth_callback_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_auth_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Continue the authentication request.
--- a/include/capi/cef_base_capi.h
+++ b/include/capi/cef_base_capi.h
@@ -45,9 +45,10 @@ 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.
  ///
@@ -57,44 +58,27 @@ typedef struct _cef_base_ref_counted_t {
  // Called to increment the reference count for the object. Should be called
  // for every new copy of a pointer to a given object.
  ///
-  void (CEF_CALLBACK *add_ref)(struct _cef_base_ref_counted_t* self);
+  void (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.
  ///
-  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.
  ///
-  int (CEF_CALLBACK *has_one_ref)(struct _cef_base_ref_counted_t* self);
-} cef_base_ref_counted_t;
+  int (CEF_CALLBACK *has_one_ref)(struct _cef_base_t* self);
+} cef_base_t;


-///
-// All scoped framework structures must include this structure first.
-///
-typedef struct _cef_base_scoped_t {
-  ///
-  // Size of the data structure.
-  ///
-  size_t 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);
-
-} 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|.
+// 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) <= \
-  *reinterpret_cast<size_t*>(s))
+  reinterpret_cast<cef_base_t*>(s)->size)

 #define CEF_MEMBER_MISSING(s, f)  (!CEF_MEMBER_EXISTS(s, f) || !((s)->f))

--- a/include/capi/cef_browser_capi.h
+++ b/include/capi/cef_browser_capi.h
@@ -63,7 +63,7 @@ typedef struct _cef_browser_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the browser host object. This function can only be called in the
@@ -193,7 +193,7 @@ typedef struct _cef_run_file_dialog_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called asynchronously after the file dialog is dismissed.
@@ -216,7 +216,7 @@ typedef struct _cef_navigation_entry_visitor_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be executed. Do not keep a reference to |entry| outside of
@@ -239,7 +239,7 @@ typedef struct _cef_pdf_print_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be executed when the PDF printing has completed. |path| is
@@ -260,7 +260,7 @@ typedef struct _cef_download_image_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be executed when the image download has completed.
@@ -285,7 +285,7 @@ typedef struct _cef_browser_host_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the hosted browser object.
@@ -430,15 +430,12 @@ typedef struct _cef_browser_host_t {
      struct _cef_pdf_print_callback_t* callback);

  ///
-  // Search for |searchText|. |identifier| must be a unique ID and these IDs
-  // must strictly increase so that newer requests always have greater IDs than
-  // older requests. If |identifier| is zero or less than the previous ID value
-  // then it will be automatically assigned a new valid ID. |forward| indicates
-  // whether to search forward or backward within the page. |matchCase|
-  // indicates whether the search should be case-sensitive. |findNext| indicates
-  // whether this is the first request or a follow-up. The cef_find_handler_t
-  // instance, if any, returned via cef_client_t::GetFindHandler will be called
-  // to report find results.
+  // Search for |searchText|. |identifier| can be used to have multiple searches
+  // running simultaniously. |forward| indicates whether to search forward or
+  // backward within the page. |matchCase| indicates whether the search should
+  // be case-sensitive. |findNext| indicates whether this is the first request
+  // or a follow-up. The cef_find_handler_t instance, if any, returned via
+  // cef_client_t::GetFindHandler will be called to report find results.
  ///
  void (CEF_CALLBACK *find)(struct _cef_browser_host_t* self, int identifier,
      const cef_string_t* searchText, int forward, int matchCase,
--- a/include/capi/cef_browser_process_handler_capi.h
+++ b/include/capi/cef_browser_process_handler_capi.h
@@ -57,7 +57,7 @@ typedef struct _cef_browser_process_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called on the browser process UI thread immediately after the CEF context
--- a/include/capi/cef_callback_capi.h
+++ b/include/capi/cef_callback_capi.h
@@ -52,7 +52,7 @@ typedef struct _cef_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Continue processing.
@@ -73,7 +73,7 @@ typedef struct _cef_completion_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be called once the task is complete.
--- a/include/capi/cef_client_capi.h
+++ b/include/capi/cef_client_capi.h
@@ -67,7 +67,7 @@ typedef struct _cef_client_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Return the handler for context menus. If no handler is provided the default
--- a/include/capi/cef_command_line_capi.h
+++ b/include/capi/cef_command_line_capi.h
@@ -59,7 +59,7 @@ typedef struct _cef_command_line_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. Do not call any other functions
--- a/include/capi/cef_context_menu_handler_capi.h
+++ b/include/capi/cef_context_menu_handler_capi.h
@@ -56,7 +56,7 @@ typedef struct _cef_run_context_menu_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Complete context menu display by selecting the specified |command_id| and
@@ -80,7 +80,7 @@ typedef struct _cef_context_menu_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called before a context menu is displayed. |params| provides information
@@ -140,7 +140,7 @@ typedef struct _cef_context_menu_params_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the X coordinate of the mouse where the context menu was invoked.
--- a/include/capi/cef_cookie_capi.h
+++ b/include/capi/cef_cookie_capi.h
@@ -57,7 +57,7 @@ typedef struct _cef_cookie_manager_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Set the schemes supported by this manager. The default schemes ("http",
@@ -172,7 +172,7 @@ 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
@@ -195,7 +195,7 @@ typedef struct _cef_set_cookie_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be called upon completion. |success| will be true (1) if
@@ -214,7 +214,7 @@ typedef struct _cef_delete_cookies_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be called upon completion. |num_deleted| will be the
--- a/include/capi/cef_crash_util_capi.h
+++ b/include/capi/cef_crash_util_capi.h
@@ -61,9 +61,6 @@ extern "C" {
 //           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;
@@ -95,12 +92,6 @@ extern "C" {
 // 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.
--- a/include/capi/cef_dialog_handler_capi.h
+++ b/include/capi/cef_dialog_handler_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_file_dialog_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Continue the file selection. |selected_accept_filter| should be the 0-based
@@ -80,7 +80,7 @@ typedef struct _cef_dialog_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called to run a file chooser dialog. |mode| represents the type of dialog
--- a/include/capi/cef_display_handler_capi.h
+++ b/include/capi/cef_display_handler_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_display_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called when a frame's address has changed.
--- a/include/capi/cef_dom_capi.h
+++ b/include/capi/cef_dom_capi.h
@@ -55,7 +55,7 @@ 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
@@ -77,7 +77,7 @@ typedef struct _cef_domdocument_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the document type.
@@ -177,7 +177,7 @@ typedef struct _cef_domnode_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the type for this node.
--- a/include/capi/cef_download_handler_capi.h
+++ b/include/capi/cef_download_handler_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_before_download_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Call to continue the download. Set |download_path| to the full file path
@@ -74,7 +74,7 @@ typedef struct _cef_download_item_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Call to cancel the download.
@@ -101,7 +101,7 @@ 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
--- a/include/capi/cef_download_item_capi.h
+++ b/include/capi/cef_download_item_capi.h
@@ -52,7 +52,7 @@ typedef struct _cef_download_item_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. Do not call any other functions
--- a/include/capi/cef_drag_data_capi.h
+++ b/include/capi/cef_drag_data_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_drag_data_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns a copy of the current object.
--- a/include/capi/cef_drag_handler_capi.h
+++ b/include/capi/cef_drag_handler_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_drag_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called when an external drag event enters the browser window. |dragData|
--- a/include/capi/cef_find_handler_capi.h
+++ b/include/capi/cef_find_handler_capi.h
@@ -54,7 +54,7 @@ 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().
--- a/include/capi/cef_focus_handler_capi.h
+++ b/include/capi/cef_focus_handler_capi.h
@@ -56,7 +56,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
--- a/include/capi/cef_frame_capi.h
+++ b/include/capi/cef_frame_capi.h
@@ -61,7 +61,7 @@ typedef struct _cef_frame_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // True if this object is currently attached to a valid frame.
--- a/include/capi/cef_geolocation_capi.h
+++ b/include/capi/cef_geolocation_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_get_geolocation_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called with the 'best available' location information or, if the location
--- a/include/capi/cef_geolocation_handler_capi.h
+++ b/include/capi/cef_geolocation_handler_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_geolocation_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Call to allow or deny geolocation access.
@@ -73,7 +73,7 @@ typedef struct _cef_geolocation_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called when a page requests permission to access geolocation information.
--- a/include/capi/cef_image_capi.h
+++ b/include/capi/cef_image_capi.h
@@ -58,7 +58,7 @@ typedef struct _cef_image_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this Image is NULL.
--- a/include/capi/cef_jsdialog_handler_capi.h
+++ b/include/capi/cef_jsdialog_handler_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_jsdialog_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Continue the JS dialog request. Set |success| to true (1) if the OK button
@@ -73,7 +73,7 @@ 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
--- a/include/capi/cef_keyboard_handler_capi.h
+++ b/include/capi/cef_keyboard_handler_capi.h
@@ -54,7 +54,7 @@ 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
--- a/include/capi/cef_life_span_handler_capi.h
+++ b/include/capi/cef_life_span_handler_capi.h
@@ -56,7 +56,7 @@ typedef struct _cef_life_span_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called on the IO thread before a new popup browser is created. The
@@ -76,9 +76,7 @@ typedef struct _cef_life_span_handler_t {
  // 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).
+  // wrapped in a cef_browser_view_t.
  ///
  int (CEF_CALLBACK *on_before_popup)(struct _cef_life_span_handler_t* self,
      struct _cef_browser_t* browser, struct _cef_frame_t* frame,
--- a/include/capi/cef_load_handler_capi.h
+++ b/include/capi/cef_load_handler_capi.h
@@ -56,7 +56,7 @@ 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
@@ -70,16 +70,15 @@ typedef struct _cef_load_handler_t {
      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.
+  // 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. |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
+  // always be called for all frames irrespective of whether the request
+  // completes successfully. 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,
@@ -90,21 +89,19 @@ typedef struct _cef_load_handler_t {
  // 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. For notification of overall browser load
+  // status use OnLoadingStateChange instead.
  ///
  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
-  // net\base\net_error_list.h for complete descriptions of the error codes.
+  // Called when the resource load for a navigation fails or is canceled.
+  // |errorCode| is the error code number, |errorText| is the error text and
+  // |failedUrl| is the URL that failed to load. 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,
--- a/include/capi/cef_menu_model_capi.h
+++ b/include/capi/cef_menu_model_capi.h
@@ -56,12 +56,7 @@ 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);
+  cef_base_t base;

  ///
  // Clears the menu. Returns true (1) on success.
@@ -384,73 +379,6 @@ typedef struct _cef_menu_model_t {
  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;


--- a/include/capi/cef_menu_model_delegate_capi.h
+++ b/include/capi/cef_menu_model_delegate_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_menu_model_delegate_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Perform the action associated with the specified |command_id| and optional
@@ -65,30 +65,6 @@ typedef struct _cef_menu_model_delegate_t {
      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.
  ///
--- a/include/capi/cef_navigation_entry_capi.h
+++ b/include/capi/cef_navigation_entry_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_navigation_entry_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. Do not call any other functions
--- a/include/capi/cef_print_handler_capi.h
+++ b/include/capi/cef_print_handler_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_print_dialog_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Continue printing with the specified |settings|.
@@ -76,7 +76,7 @@ typedef struct _cef_print_job_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Indicate completion of the print job.
@@ -93,7 +93,7 @@ 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
--- a/include/capi/cef_print_settings_capi.h
+++ b/include/capi/cef_print_settings_capi.h
@@ -52,7 +52,7 @@ typedef struct _cef_print_settings_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. Do not call any other functions
--- a/include/capi/cef_process_message_capi.h
+++ b/include/capi/cef_process_message_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_process_message_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. Do not call any other functions
--- a/include/capi/cef_render_handler_capi.h
+++ b/include/capi/cef_render_handler_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_render_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called to retrieve the root window rectangle in screen coordinates. Return
--- a/include/capi/cef_render_process_handler_capi.h
+++ b/include/capi/cef_render_process_handler_capi.h
@@ -61,7 +61,7 @@ typedef struct _cef_render_process_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called after the render process main thread has been created. |extra_info|
--- a/include/capi/cef_request_capi.h
+++ b/include/capi/cef_request_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_request_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is read-only.
@@ -205,7 +205,7 @@ typedef struct _cef_post_data_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is read-only.
@@ -265,7 +265,7 @@ typedef struct _cef_post_data_element_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is read-only.
--- a/include/capi/cef_request_context_capi.h
+++ b/include/capi/cef_request_context_capi.h
@@ -56,7 +56,7 @@ typedef struct _cef_resolve_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called after the ResolveHost request has completed. |result| will be the
@@ -89,7 +89,7 @@ typedef struct _cef_request_context_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is pointing to the same context as |that|
--- a/include/capi/cef_request_context_handler_capi.h
+++ b/include/capi/cef_request_context_handler_capi.h
@@ -56,7 +56,7 @@ typedef struct _cef_request_context_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called on the browser process IO thread to retrieve the cookie manager. If
--- a/include/capi/cef_request_handler_capi.h
+++ b/include/capi/cef_request_handler_capi.h
@@ -61,7 +61,7 @@ typedef struct _cef_request_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Continue the url request. If |allow| is true (1) the request will be
@@ -83,7 +83,7 @@ typedef struct _cef_select_client_certificate_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Chooses the specified certificate for client certificate authentication.
@@ -103,7 +103,7 @@ typedef struct _cef_request_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called on the UI thread before browser navigation. Return true (1) to
--- a/include/capi/cef_resource_bundle_capi.h
+++ b/include/capi/cef_resource_bundle_capi.h
@@ -56,7 +56,7 @@ typedef struct _cef_resource_bundle_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the localized string for the specified |string_id| or an NULL
--- a/include/capi/cef_resource_bundle_handler_capi.h
+++ b/include/capi/cef_resource_bundle_handler_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_resource_bundle_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called to retrieve a localized translation for the specified |string_id|.
--- a/include/capi/cef_resource_handler_capi.h
+++ b/include/capi/cef_resource_handler_capi.h
@@ -58,7 +58,7 @@ typedef struct _cef_resource_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Begin processing the request. To handle the request return true (1) and
--- a/include/capi/cef_response_capi.h
+++ b/include/capi/cef_response_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_response_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is read-only.
--- a/include/capi/cef_response_filter_capi.h
+++ b/include/capi/cef_response_filter_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_response_filter_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Initialize the response filter. Will only be called a single time. The
@@ -62,35 +62,22 @@ typedef struct _cef_response_filter_t {
  int (CEF_CALLBACK *init_filter)(struct _cef_response_filter_t* self);

  ///
-  // Called to filter a chunk of data. Expected usage is as follows:
-  //
-  //  A. Read input data from |data_in| and set |data_in_read| to the number of
-  //     bytes that were read up to a maximum of |data_in_size|. |data_in| will
-  //     be NULL if |data_in_size| is zero.
-  //  B. Write filtered output data to |data_out| and set |data_out_written| to
-  //     the number of bytes that were written up to a maximum of
-  //     |data_out_size|. If no output data was written then all data must be
-  //     read from |data_in| (user must set |data_in_read| = |data_in_size|).
-  //  C. Return RESPONSE_FILTER_DONE if all output data was written or
-  //     RESPONSE_FILTER_NEED_MORE_DATA if output data is still pending.
-  //
-  // This function will be called repeatedly until the input buffer has been
-  // fully read (user sets |data_in_read| = |data_in_size|) and there is no more
-  // input data to filter (the resource response is complete). This function may
-  // then be called an additional time with an NULL input buffer if the user
-  // filled the output buffer (set |data_out_written| = |data_out_size|) and
-  // returned RESPONSE_FILTER_NEED_MORE_DATA to indicate that output data is
-  // still pending.
-  //
-  // Calls to this function will stop when one of the following conditions is
-  // met:
-  //
-  //  A. There is no more input data to filter (the resource response is
-  //     complete) and the user sets |data_out_written| = 0 or returns
-  //     RESPONSE_FILTER_DONE to indicate that all data has been written, or;
-  //  B. The user returns RESPONSE_FILTER_ERROR to indicate an error.
-  //
-  // Do not keep a reference to the buffers passed to this function.
+  // Called to filter a chunk of data. |data_in| is the input buffer containing
+  // |data_in_size| bytes of pre-filter data (|data_in| will be NULL if
+  // |data_in_size| is zero). |data_out| is the output buffer that can accept up
+  // to |data_out_size| bytes of filtered output data. Set |data_in_read| to the
+  // number of bytes that were read from |data_in|. Set |data_out_written| to
+  // the number of bytes that were written into |data_out|. If some or all of
+  // the pre-filter data was read successfully but more data is needed in order
+  // to continue filtering (filtered output is pending) return
+  // RESPONSE_FILTER_NEED_MORE_DATA. If some or all of the pre-filter data was
+  // read successfully and all available filtered output has been written return
+  // RESPONSE_FILTER_DONE. If an error occurs during filtering return
+  // RESPONSE_FILTER_ERROR. This function will be called repeatedly until there
+  // is no more data to filter (resource response is complete), |data_in_read|
+  // matches |data_in_size| (all available pre-filter bytes have been read), and
+  // the function returns RESPONSE_FILTER_DONE or RESPONSE_FILTER_ERROR. Do not
+  // keep a reference to the buffers passed to this function.
  ///
  cef_response_filter_status_t (CEF_CALLBACK *filter)(
      struct _cef_response_filter_t* self, void* data_in, size_t data_in_size,
--- a/include/capi/cef_scheme_capi.h
+++ b/include/capi/cef_scheme_capi.h
@@ -58,7 +58,7 @@ typedef struct _cef_scheme_registrar_t {
  ///
  // Base structure.
  ///
-  cef_base_scoped_t base;
+  cef_base_t base;

  ///
  // Register a custom scheme. This function should not be called for the built-
@@ -87,33 +87,20 @@ typedef struct _cef_scheme_registrar_t {
  // is. For example, "scheme:///some%20text" will remain the same. Non-standard
  // scheme URLs cannot be used as a target for form submission.
  //
-  // If |is_local| is true (1) the scheme will be treated with the same security
-  // rules as those applied to "file" URLs. Normal pages cannot link to or
-  // access local URLs. Also, by default, local URLs can only perform
-  // XMLHttpRequest calls to the same URL (origin + path) that originated the
-  // request. To allow XMLHttpRequest calls from a local URL to other URLs with
-  // the same origin set the CefSettings.file_access_from_file_urls_allowed
-  // value to true (1). To allow XMLHttpRequest calls from a local URL to all
-  // origins set the CefSettings.universal_access_from_file_urls_allowed value
-  // to true (1).
+  // If |is_local| is true (1) the scheme will be treated as local (i.e., with
+  // the same security rules as those applied to "file" URLs). Normal pages
+  // cannot link to or access local URLs. Also, by default, local URLs can only
+  // perform XMLHttpRequest calls to the same URL (origin + path) that
+  // originated the request. To allow XMLHttpRequest calls from a local URL to
+  // other URLs with the same origin set the
+  // CefSettings.file_access_from_file_urls_allowed value to true (1). To allow
+  // XMLHttpRequest calls from a local URL to all origins set the
+  // CefSettings.universal_access_from_file_urls_allowed value to true (1).
  //
-  // If |is_display_isolated| is true (1) the scheme can only be displayed from
-  // other content hosted with the same scheme. For example, pages in other
-  // origins cannot create iframes or hyperlinks to URLs with the scheme. For
-  // schemes that must be accessible from other schemes set this value to false
-  // (0), set |is_cors_enabled| to true (1), and use CORS "Access-Control-Allow-
-  // Origin" headers to further restrict access.
-  //
-  // If |is_secure| is true (1) the scheme will be treated with the same
-  // security rules as those applied to "https" URLs. For example, loading this
-  // scheme from other secure schemes will not trigger mixed content warnings.
-  //
-  // If |is_cors_enabled| is true (1) the scheme can be sent CORS requests. This
-  // value should be true (1) in most cases where |is_standard| is true (1).
-  //
-  // If |is_csp_bypassing| is true (1) the scheme can bypass Content-Security-
-  // Policy (CSP) checks. This value should be false (0) in most cases where
-  // |is_standard| is true (1).
+  // If |is_display_isolated| is true (1) the scheme will be treated as display-
+  // isolated. This means that pages cannot display these URLs unless they are
+  // from the same scheme. For example, pages in another origin cannot create
+  // iframes or hyperlinks to URLs with this scheme.
  //
  // This function may be called on any thread. It should only be called once
  // per unique |scheme_name| value. If |scheme_name| is already registered or
@@ -121,8 +108,7 @@ typedef struct _cef_scheme_registrar_t {
  ///
  int (CEF_CALLBACK *add_custom_scheme)(struct _cef_scheme_registrar_t* self,
      const cef_string_t* scheme_name, int is_standard, int is_local,
-      int is_display_isolated, int is_secure, int is_cors_enabled,
-      int is_csp_bypassing);
+      int is_display_isolated);
 } cef_scheme_registrar_t;


@@ -135,7 +121,7 @@ typedef struct _cef_scheme_handler_factory_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Return a new resource handler instance to handle the request or an NULL
--- a/include/capi/cef_ssl_info_capi.h
+++ b/include/capi/cef_ssl_info_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_sslinfo_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns a bitmask containing any and all problems verifying the server
--- a/include/capi/cef_ssl_status_capi.h
+++ b/include/capi/cef_ssl_status_capi.h
@@ -54,7 +54,7 @@ typedef struct _cef_sslstatus_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.
--- a/include/capi/cef_stream_capi.h
+++ b/include/capi/cef_stream_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_read_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Read raw binary data.
@@ -95,7 +95,7 @@ typedef struct _cef_stream_reader_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Read raw binary data.
@@ -156,7 +156,7 @@ typedef struct _cef_write_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Write raw binary data.
@@ -198,7 +198,7 @@ typedef struct _cef_stream_writer_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Write raw binary data.
--- a/include/capi/cef_string_visitor_capi.h
+++ b/include/capi/cef_string_visitor_capi.h
@@ -52,7 +52,7 @@ typedef struct _cef_string_visitor_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be executed.
--- a/include/capi/cef_task_capi.h
+++ b/include/capi/cef_task_capi.h
@@ -57,7 +57,7 @@ typedef struct _cef_task_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be executed on the target thread.
@@ -79,7 +79,7 @@ typedef struct _cef_task_runner_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is pointing to the same task runner as
--- a/include/capi/cef_thread_capi.h
+++ b/include/capi/cef_thread_capi.h
@@ -61,7 +61,7 @@ typedef struct _cef_thread_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the cef_task_tRunner that will execute code on this thread's
--- a/include/capi/cef_trace_capi.h
+++ b/include/capi/cef_trace_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_end_tracing_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Called after all processes have sent their trace data. |tracing_file| is
--- a/include/capi/cef_urlrequest_capi.h
+++ b/include/capi/cef_urlrequest_capi.h
@@ -61,7 +61,7 @@ typedef struct _cef_urlrequest_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the request object used to create this URL request. The returned
@@ -133,7 +133,7 @@ typedef struct _cef_urlrequest_client_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Notifies the client that the request has completed. Use the
--- a/include/capi/cef_v8_capi.h
+++ b/include/capi/cef_v8_capi.h
@@ -63,7 +63,7 @@ typedef struct _cef_v8context_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the task runner associated with this context. V8 handles can only
@@ -161,7 +161,7 @@ typedef struct _cef_v8handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Handle execution of the function identified by |name|. |object| is the
@@ -187,7 +187,7 @@ typedef struct _cef_v8accessor_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Handle retrieval the accessor value identified by |name|. |object| is the
@@ -225,7 +225,7 @@ typedef struct _cef_v8interceptor_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Handle retrieval of the interceptor value identified by |name|. |object| is
@@ -285,7 +285,7 @@ typedef struct _cef_v8exception_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the exception message.
@@ -352,7 +352,7 @@ typedef struct _cef_v8value_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if the underlying handle is valid and it can be accessed
@@ -585,12 +585,12 @@ typedef struct _cef_v8value_t {
  // called on user created objects.
  ///
  int (CEF_CALLBACK *set_user_data)(struct _cef_v8value_t* self,
-      struct _cef_base_ref_counted_t* user_data);
+      struct _cef_base_t* user_data);

  ///
  // Returns the user data, if any, assigned to this object.
  ///
-  struct _cef_base_ref_counted_t* (CEF_CALLBACK *get_user_data)(
+  struct _cef_base_t* (CEF_CALLBACK *get_user_data)(
      struct _cef_v8value_t* self);

  ///
@@ -752,7 +752,7 @@ typedef struct _cef_v8stack_trace_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if the underlying handle is valid and it can be accessed
@@ -792,7 +792,7 @@ typedef struct _cef_v8stack_frame_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if the underlying handle is valid and it can be accessed
--- a/include/capi/cef_values_capi.h
+++ b/include/capi/cef_values_capi.h
@@ -57,7 +57,7 @@ typedef struct _cef_value_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if the underlying data is valid. This will always be true
@@ -228,7 +228,7 @@ typedef struct _cef_binary_value_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. This object may become invalid if
@@ -293,7 +293,7 @@ typedef struct _cef_dictionary_value_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. This object may become invalid if
@@ -520,7 +520,7 @@ typedef struct _cef_list_value_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns true (1) if this object is valid. This object may become invalid if
--- a/include/capi/cef_waitable_event_capi.h
+++ b/include/capi/cef_waitable_event_capi.h
@@ -60,7 +60,7 @@ typedef struct _cef_waitable_event_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Put the event in the un-signaled state.
--- a/include/capi/cef_web_plugin_capi.h
+++ b/include/capi/cef_web_plugin_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_web_plugin_info_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the plugin name (i.e. Flash).
@@ -93,7 +93,7 @@ typedef struct _cef_web_plugin_info_visitor_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be called once for each plugin. |count| is the 0-based
@@ -114,7 +114,7 @@ typedef struct _cef_web_plugin_unstable_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be called for the requested plugin. |unstable| will be
@@ -136,7 +136,7 @@ typedef struct _cef_register_cdm_callback_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Method that will be called when CDM registration is complete. |result| will
--- a/include/capi/cef_x509_certificate_capi.h
+++ b/include/capi/cef_x509_certificate_capi.h
@@ -53,7 +53,7 @@ typedef struct _cef_x509cert_principal_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns a name that can be used to represent the issuer. It tries in this
@@ -125,7 +125,7 @@ typedef struct _cef_x509certificate_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the subject of the X.509 certificate. For HTTPS server certificates
--- a/include/capi/cef_xml_reader_capi.h
+++ b/include/capi/cef_xml_reader_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_xml_reader_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Moves the cursor to the next node in the document. This function must be
--- a/include/capi/cef_zip_reader_capi.h
+++ b/include/capi/cef_zip_reader_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_zip_reader_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Moves the cursor to the first file in the archive. Returns true (1) if the
--- a/include/capi/test/cef_translator_test_capi.h
+++ b/include/capi/test/cef_translator_test_capi.h
@@ -49,14 +49,10 @@
 extern "C" {
 #endif

-struct _cef_translator_test_ref_ptr_client_child_t;
-struct _cef_translator_test_ref_ptr_client_t;
-struct _cef_translator_test_ref_ptr_library_child_t;
-struct _cef_translator_test_ref_ptr_library_t;
-struct _cef_translator_test_scoped_client_child_t;
-struct _cef_translator_test_scoped_client_t;
-struct _cef_translator_test_scoped_library_child_t;
-struct _cef_translator_test_scoped_library_t;
+struct _cef_translator_test_handler_child_t;
+struct _cef_translator_test_handler_t;
+struct _cef_translator_test_object_child_t;
+struct _cef_translator_test_object_t;

 ///
 // Structure for testing all of the possible data transfer types.
@@ -65,7 +61,7 @@ typedef struct _cef_translator_test_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;


  // PRIMITIVE VALUES
@@ -246,271 +242,124 @@ typedef struct _cef_translator_test_t {
      struct _cef_translator_test_t* self);


-  // LIBRARY-SIDE REFPTR VALUES
+  // LIBRARY-SIDE OBJECT VALUES

  ///
  // Return an new library-side object.
  ///
-  struct _cef_translator_test_ref_ptr_library_t* (
-      CEF_CALLBACK *get_ref_ptr_library)(struct _cef_translator_test_t* self,
-      int val);
+  struct _cef_translator_test_object_t* (CEF_CALLBACK *get_object)(
+      struct _cef_translator_test_t* self, int val);

  ///
  // Set an object. Returns the value from
-  // cef_translator_test_ref_ptr_library_t::get_value(). This tests input and
-  // execution of a library-side object type.
+  // cef_translator_test_object_t::get_value(). This tests input and execution
+  // of a library-side object type.
  ///
-  int (CEF_CALLBACK *set_ref_ptr_library)(struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_library_t* val);
+  int (CEF_CALLBACK *set_object)(struct _cef_translator_test_t* self,
+      struct _cef_translator_test_object_t* val);

  ///
  // Set an object. Returns the object passed in. This tests input and output of
  // a library-side object type.
  ///
-  struct _cef_translator_test_ref_ptr_library_t* (
-      CEF_CALLBACK *set_ref_ptr_library_and_return)(
+  struct _cef_translator_test_object_t* (CEF_CALLBACK *set_object_and_return)(
      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_library_t* val);
+      struct _cef_translator_test_object_t* val);

  ///
  // Set a child object. Returns the value from
-  // cef_translator_test_ref_ptr_library_t::get_value(). This tests input of a
-  // library- side child object type and execution as the parent type.
+  // cef_translator_test_object_t::get_value(). This tests input of a library-
+  // side child object type and execution as the parent type.
  ///
-  int (CEF_CALLBACK *set_child_ref_ptr_library)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_library_child_t* val);
+  int (CEF_CALLBACK *set_child_object)(struct _cef_translator_test_t* self,
+      struct _cef_translator_test_object_child_t* val);

  ///
  // Set a child object. Returns the object as the parent type. This tests input
  // of a library-side child object type and return as the parent type.
  ///
-  struct _cef_translator_test_ref_ptr_library_t* (
-      CEF_CALLBACK *set_child_ref_ptr_library_and_return_parent)(
+  struct _cef_translator_test_object_t* (
+      CEF_CALLBACK *set_child_object_and_return_parent)(
      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_library_child_t* val);
+      struct _cef_translator_test_object_child_t* val);

  ///
  // Set an object list vlaue.
  ///
-  int (CEF_CALLBACK *set_ref_ptr_library_list)(
-      struct _cef_translator_test_t* self, size_t valCount,
-      struct _cef_translator_test_ref_ptr_library_t* const* val, int val1,
-      int val2);
+  int (CEF_CALLBACK *set_object_list)(struct _cef_translator_test_t* self,
+      size_t valCount, struct _cef_translator_test_object_t* const* val,
+      int val1, int val2);

  ///
  // Return an object list value by out-param.
  ///
-  int (CEF_CALLBACK *get_ref_ptr_library_list_by_ref)(
+  int (CEF_CALLBACK *get_object_list_by_ref)(
      struct _cef_translator_test_t* self, size_t* valCount,
-      struct _cef_translator_test_ref_ptr_library_t** val, int val1,
-      int val2);
+      struct _cef_translator_test_object_t** val, int val1, int val2);

  ///
  // Return the number of object that will be output above.
  ///
-  size_t (CEF_CALLBACK *get_ref_ptr_library_list_size)(
+  size_t (CEF_CALLBACK *get_object_list_size)(
      struct _cef_translator_test_t* self);


-  // CLIENT-SIDE REFPTR VALUES
+  // CLIENT-SIDE OBJECT VALUES

  ///
  // Set an object. Returns the value from
-  // cef_translator_test_ref_ptr_client_t::get_value(). This tests input and
-  // execution of a client-side object type.
+  // cef_translator_test_handler_t::get_value(). This tests input and execution
+  // of a client-side object type.
  ///
-  int (CEF_CALLBACK *set_ref_ptr_client)(struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_client_t* val);
+  int (CEF_CALLBACK *set_handler)(struct _cef_translator_test_t* self,
+      struct _cef_translator_test_handler_t* val);

  ///
  // Set an object. Returns the handler passed in. This tests input and output
  // of a client-side object type.
  ///
-  struct _cef_translator_test_ref_ptr_client_t* (
-      CEF_CALLBACK *set_ref_ptr_client_and_return)(
+  struct _cef_translator_test_handler_t* (CEF_CALLBACK *set_handler_and_return)(
      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_client_t* val);
+      struct _cef_translator_test_handler_t* val);

  ///
  // Set a child object. Returns the value from
-  // cef_translator_test_ref_ptr_client_t::get_value(). This tests input of a
-  // client- side child object type and execution as the parent type.
+  // cef_translator_test_handler_t::get_value(). This tests input of a client-
+  // side child object type and execution as the parent type.
  ///
-  int (CEF_CALLBACK *set_child_ref_ptr_client)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_client_child_t* val);
+  int (CEF_CALLBACK *set_child_handler)(struct _cef_translator_test_t* self,
+      struct _cef_translator_test_handler_child_t* val);

  ///
  // Set a child object. Returns the object as the parent type. This tests input
  // of a client-side child object type and return as the parent type.
  ///
-  struct _cef_translator_test_ref_ptr_client_t* (
-      CEF_CALLBACK *set_child_ref_ptr_client_and_return_parent)(
+  struct _cef_translator_test_handler_t* (
+      CEF_CALLBACK *set_child_handler_and_return_parent)(
      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_ref_ptr_client_child_t* val);
+      struct _cef_translator_test_handler_child_t* val);

  ///
  // Set an object list vlaue.
  ///
-  int (CEF_CALLBACK *set_ref_ptr_client_list)(
-      struct _cef_translator_test_t* self, size_t valCount,
-      struct _cef_translator_test_ref_ptr_client_t* const* val, int val1,
-      int val2);
+  int (CEF_CALLBACK *set_handler_list)(struct _cef_translator_test_t* self,
+      size_t valCount, struct _cef_translator_test_handler_t* const* val,
+      int val1, int val2);

  ///
  // Return an object list value by out-param.
  ///
-  int (CEF_CALLBACK *get_ref_ptr_client_list_by_ref)(
+  int (CEF_CALLBACK *get_handler_list_by_ref)(
      struct _cef_translator_test_t* self, size_t* valCount,
-      struct _cef_translator_test_ref_ptr_client_t** val,
-      struct _cef_translator_test_ref_ptr_client_t* val1,
-      struct _cef_translator_test_ref_ptr_client_t* val2);
+      struct _cef_translator_test_handler_t** val,
+      struct _cef_translator_test_handler_t* val1,
+      struct _cef_translator_test_handler_t* val2);

  ///
  // Return the number of object that will be output above.
  ///
-  size_t (CEF_CALLBACK *get_ref_ptr_client_list_size)(
+  size_t (CEF_CALLBACK *get_handler_list_size)(
      struct _cef_translator_test_t* self);
-
-
-  // LIBRARY-SIDE OWNPTR VALUES
-
-  ///
-  // Return an new library-side object.
-  ///
-  struct _cef_translator_test_scoped_library_t* (
-      CEF_CALLBACK *get_own_ptr_library)(struct _cef_translator_test_t* self,
-      int val);
-
-  ///
-  // Set an object. Returns the value from
-  // cef_translator_test_scoped_library_t::get_value(). This tests input and
-  // execution of a library-side object type.
-  ///
-  int (CEF_CALLBACK *set_own_ptr_library)(struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_library_t* val);
-
-  ///
-  // Set an object. Returns the object passed in. This tests input and output of
-  // a library-side object type.
-  ///
-  struct _cef_translator_test_scoped_library_t* (
-      CEF_CALLBACK *set_own_ptr_library_and_return)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_library_t* val);
-
-  ///
-  // Set a child object. Returns the value from
-  // cef_translator_test_scoped_library_t::get_value(). This tests input of a
-  // library- side child object type and execution as the parent type.
-  ///
-  int (CEF_CALLBACK *set_child_own_ptr_library)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_library_child_t* val);
-
-  ///
-  // Set a child object. Returns the object as the parent type. This tests input
-  // of a library-side child object type and return as the parent type.
-  ///
-  struct _cef_translator_test_scoped_library_t* (
-      CEF_CALLBACK *set_child_own_ptr_library_and_return_parent)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_library_child_t* val);
-
-
-  // CLIENT-SIDE OWNPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // cef_translator_test_scoped_client_t::get_value(). This tests input and
-  // execution of a client-side object type.
-  ///
-  int (CEF_CALLBACK *set_own_ptr_client)(struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_client_t* val);
-
-  ///
-  // Set an object. Returns the handler passed in. This tests input and output
-  // of a client-side object type.
-  ///
-  struct _cef_translator_test_scoped_client_t* (
-      CEF_CALLBACK *set_own_ptr_client_and_return)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_client_t* val);
-
-  ///
-  // Set a child object. Returns the value from
-  // cef_translator_test_scoped_client_t::get_value(). This tests input of a
-  // client- side child object type and execution as the parent type.
-  ///
-  int (CEF_CALLBACK *set_child_own_ptr_client)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_client_child_t* val);
-
-  ///
-  // Set a child object. Returns the object as the parent type. This tests input
-  // of a client-side child object type and return as the parent type.
-  ///
-  struct _cef_translator_test_scoped_client_t* (
-      CEF_CALLBACK *set_child_own_ptr_client_and_return_parent)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_client_child_t* val);
-
-
-  // LIBRARY-SIDE RAWPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // cef_translator_test_scoped_library_t::get_value(). This tests input and
-  // execution of a library-side object type.
-  ///
-  int (CEF_CALLBACK *set_raw_ptr_library)(struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_library_t* val);
-
-  ///
-  // Set a child object. Returns the value from
-  // cef_translator_test_scoped_library_t::get_value(). This tests input of a
-  // library- side child object type and execution as the parent type.
-  ///
-  int (CEF_CALLBACK *set_child_raw_ptr_library)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_library_child_t* val);
-
-  ///
-  // Set an object list vlaue.
-  ///
-  int (CEF_CALLBACK *set_raw_ptr_library_list)(
-      struct _cef_translator_test_t* self, size_t valCount,
-      struct _cef_translator_test_scoped_library_t* const* val, int val1,
-      int val2);
-
-
-  // CLIENT-SIDE RAWPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // cef_translator_test_scoped_client_t::get_value(). This tests input and
-  // execution of a client-side object type.
-  ///
-  int (CEF_CALLBACK *set_raw_ptr_client)(struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_client_t* val);
-
-  ///
-  // Set a child object. Returns the value from
-  // cef_translator_test_scoped_client_t::get_value(). This tests input of a
-  // client- side child object type and execution as the parent type.
-  ///
-  int (CEF_CALLBACK *set_child_raw_ptr_client)(
-      struct _cef_translator_test_t* self,
-      struct _cef_translator_test_scoped_client_child_t* val);
-
-  ///
-  // Set an object list vlaue.
-  ///
-  int (CEF_CALLBACK *set_raw_ptr_client_list)(
-      struct _cef_translator_test_t* self, size_t valCount,
-      struct _cef_translator_test_scoped_client_t* const* val, int val1,
-      int val2);
 } cef_translator_test_t;


@@ -521,253 +370,125 @@ CEF_EXPORT cef_translator_test_t* cef_translator_test_create();


 ///
-// Library-side test object for RefPtr.
+// Library-side test object.
 ///
-typedef struct _cef_translator_test_ref_ptr_library_t {
+typedef struct _cef_translator_test_object_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Return a value.
  ///
-  int (CEF_CALLBACK *get_value)(
-      struct _cef_translator_test_ref_ptr_library_t* self);
+  int (CEF_CALLBACK *get_value)(struct _cef_translator_test_object_t* self);

  ///
  // Set a value.
  ///
-  void (CEF_CALLBACK *set_value)(
-      struct _cef_translator_test_ref_ptr_library_t* self, int value);
-} cef_translator_test_ref_ptr_library_t;
+  void (CEF_CALLBACK *set_value)(struct _cef_translator_test_object_t* self,
+      int value);
+} cef_translator_test_object_t;


 ///
 // Create the test object.
 ///
-CEF_EXPORT cef_translator_test_ref_ptr_library_t* cef_translator_test_ref_ptr_library_create(
+CEF_EXPORT cef_translator_test_object_t* cef_translator_test_object_create(
    int value);


 ///
-// Library-side child test object for RefPtr.
+// Library-side child test object.
 ///
-typedef struct _cef_translator_test_ref_ptr_library_child_t {
+typedef struct _cef_translator_test_object_child_t {
  ///
  // Base structure.
  ///
-  cef_translator_test_ref_ptr_library_t base;
+  cef_translator_test_object_t base;

  ///
  // Return a value.
  ///
  int (CEF_CALLBACK *get_other_value)(
-      struct _cef_translator_test_ref_ptr_library_child_t* self);
+      struct _cef_translator_test_object_child_t* self);

  ///
  // Set a value.
  ///
  void (CEF_CALLBACK *set_other_value)(
-      struct _cef_translator_test_ref_ptr_library_child_t* self, int value);
-} cef_translator_test_ref_ptr_library_child_t;
+      struct _cef_translator_test_object_child_t* self, int value);
+} cef_translator_test_object_child_t;


 ///
 // Create the test object.
 ///
-CEF_EXPORT cef_translator_test_ref_ptr_library_child_t* cef_translator_test_ref_ptr_library_child_create(
+CEF_EXPORT cef_translator_test_object_child_t* cef_translator_test_object_child_create(
    int value, int other_value);


 ///
-// Another library-side child test object for RefPtr.
+// Another library-side child test object.
 ///
-typedef struct _cef_translator_test_ref_ptr_library_child_child_t {
+typedef struct _cef_translator_test_object_child_child_t {
  ///
  // Base structure.
  ///
-  cef_translator_test_ref_ptr_library_child_t base;
+  cef_translator_test_object_child_t base;

  ///
  // Return a value.
  ///
  int (CEF_CALLBACK *get_other_other_value)(
-      struct _cef_translator_test_ref_ptr_library_child_child_t* self);
+      struct _cef_translator_test_object_child_child_t* self);

  ///
  // Set a value.
  ///
  void (CEF_CALLBACK *set_other_other_value)(
-      struct _cef_translator_test_ref_ptr_library_child_child_t* self,
-      int value);
-} cef_translator_test_ref_ptr_library_child_child_t;
+      struct _cef_translator_test_object_child_child_t* self, int value);
+} cef_translator_test_object_child_child_t;


 ///
 // Create the test object.
 ///
-CEF_EXPORT cef_translator_test_ref_ptr_library_child_child_t* cef_translator_test_ref_ptr_library_child_child_create(
+CEF_EXPORT cef_translator_test_object_child_child_t* cef_translator_test_object_child_child_create(
    int value, int other_value, int other_other_value);


 ///
-// Client-side test object for RefPtr.
+// Client-side test object.
 ///
-typedef struct _cef_translator_test_ref_ptr_client_t {
+typedef struct _cef_translator_test_handler_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Return a value.
  ///
-  int (CEF_CALLBACK *get_value)(
-      struct _cef_translator_test_ref_ptr_client_t* self);
-} cef_translator_test_ref_ptr_client_t;
+  int (CEF_CALLBACK *get_value)(struct _cef_translator_test_handler_t* self);
+} cef_translator_test_handler_t;


 ///
-// Client-side child test object for RefPtr.
+// Client-side child test object.
 ///
-typedef struct _cef_translator_test_ref_ptr_client_child_t {
+typedef struct _cef_translator_test_handler_child_t {
  ///
  // Base structure.
  ///
-  cef_translator_test_ref_ptr_client_t base;
+  cef_translator_test_handler_t base;

  ///
  // Return a value.
  ///
  int (CEF_CALLBACK *get_other_value)(
-      struct _cef_translator_test_ref_ptr_client_child_t* self);
-} cef_translator_test_ref_ptr_client_child_t;
-
-
-///
-// Library-side test object for OwnPtr/RawPtr.
-///
-typedef struct _cef_translator_test_scoped_library_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_scoped_t base;
-
-  ///
-  // Return a value.
-  ///
-  int (CEF_CALLBACK *get_value)(
-      struct _cef_translator_test_scoped_library_t* self);
-
-  ///
-  // Set a value.
-  ///
-  void (CEF_CALLBACK *set_value)(
-      struct _cef_translator_test_scoped_library_t* self, int value);
-} cef_translator_test_scoped_library_t;
-
-
-///
-// Create the test object.
-///
-CEF_EXPORT cef_translator_test_scoped_library_t* cef_translator_test_scoped_library_create(
-    int value);
-
-
-///
-// Library-side child test object for OwnPtr/RawPtr.
-///
-typedef struct _cef_translator_test_scoped_library_child_t {
-  ///
-  // Base structure.
-  ///
-  cef_translator_test_scoped_library_t base;
-
-  ///
-  // Return a value.
-  ///
-  int (CEF_CALLBACK *get_other_value)(
-      struct _cef_translator_test_scoped_library_child_t* self);
-
-  ///
-  // Set a value.
-  ///
-  void (CEF_CALLBACK *set_other_value)(
-      struct _cef_translator_test_scoped_library_child_t* self, int value);
-} cef_translator_test_scoped_library_child_t;
-
-
-///
-// Create the test object.
-///
-CEF_EXPORT cef_translator_test_scoped_library_child_t* cef_translator_test_scoped_library_child_create(
-    int value, int other_value);
-
-
-///
-// Another library-side child test object for OwnPtr/RawPtr.
-///
-typedef struct _cef_translator_test_scoped_library_child_child_t {
-  ///
-  // Base structure.
-  ///
-  cef_translator_test_scoped_library_child_t base;
-
-  ///
-  // Return a value.
-  ///
-  int (CEF_CALLBACK *get_other_other_value)(
-      struct _cef_translator_test_scoped_library_child_child_t* self);
-
-  ///
-  // Set a value.
-  ///
-  void (CEF_CALLBACK *set_other_other_value)(
-      struct _cef_translator_test_scoped_library_child_child_t* self,
-      int value);
-} cef_translator_test_scoped_library_child_child_t;
-
-
-///
-// Create the test object.
-///
-CEF_EXPORT cef_translator_test_scoped_library_child_child_t* cef_translator_test_scoped_library_child_child_create(
-    int value, int other_value, int other_other_value);
-
-
-///
-// Client-side test object for OwnPtr/RawPtr.
-///
-typedef struct _cef_translator_test_scoped_client_t {
-  ///
-  // Base structure.
-  ///
-  cef_base_scoped_t base;
-
-  ///
-  // Return a value.
-  ///
-  int (CEF_CALLBACK *get_value)(
-      struct _cef_translator_test_scoped_client_t* self);
-} cef_translator_test_scoped_client_t;
-
-
-///
-// Client-side child test object for OwnPtr/RawPtr.
-///
-typedef struct _cef_translator_test_scoped_client_child_t {
-  ///
-  // Base structure.
-  ///
-  cef_translator_test_scoped_client_t base;
-
-  ///
-  // Return a value.
-  ///
-  int (CEF_CALLBACK *get_other_value)(
-      struct _cef_translator_test_scoped_client_child_t* self);
-} cef_translator_test_scoped_client_child_t;
+      struct _cef_translator_test_handler_child_t* self);
+} cef_translator_test_handler_child_t;


 #ifdef __cplusplus
--- a/include/capi/views/cef_browser_view_capi.h
+++ b/include/capi/views/cef_browser_view_capi.h
@@ -63,18 +63,6 @@ typedef struct _cef_browser_view_t {
  ///
  struct _cef_browser_t* (CEF_CALLBACK *get_browser)(
      struct _cef_browser_view_t* self);
-
-  ///
-  // Sets whether accelerators registered with cef_window_t::SetAccelerator are
-  // triggered before or after the event is sent to the cef_browser_t. If
-  // |prefer_accelerators| is true (1) then the matching accelerator will be
-  // triggered immediately and the event will not be sent to the cef_browser_t.
-  // If |prefer_accelerators| is false (0) then the matching accelerator will
-  // only be triggered if the event is not handled by web content or by
-  // cef_keyboard_handler_t. The default value is false (0).
-  ///
-  void (CEF_CALLBACK *set_prefer_accelerators)(struct _cef_browser_view_t* self,
-      int prefer_accelerators);
 } cef_browser_view_t;


--- a/include/capi/views/cef_button_capi.h
+++ b/include/capi/views/cef_button_capi.h
@@ -74,12 +74,6 @@ typedef struct _cef_button_t {
  ///
  cef_button_state_t (CEF_CALLBACK *get_state)(struct _cef_button_t* self);

-  ///
-  // Sets the Button will use an ink drop effect for displaying state changes.
-  ///
-  void (CEF_CALLBACK *set_ink_drop_enabled)(struct _cef_button_t* self,
-      int enabled);
-
  ///
  // Sets the tooltip text that will be displayed when the user hovers the mouse
  // cursor over the Button.
--- a/include/capi/views/cef_button_delegate_capi.h
+++ b/include/capi/views/cef_button_delegate_capi.h
@@ -62,12 +62,6 @@ typedef struct _cef_button_delegate_t {
  ///
  void (CEF_CALLBACK *on_button_pressed)(struct _cef_button_delegate_t* self,
      struct _cef_button_t* button);
-
-  ///
-  // Called when the state of |button| changes.
-  ///
-  void (CEF_CALLBACK *on_button_state_changed)(
-      struct _cef_button_delegate_t* self, struct _cef_button_t* button);
 } cef_button_delegate_t;


--- a/include/capi/views/cef_display_capi.h
+++ b/include/capi/views/cef_display_capi.h
@@ -57,7 +57,7 @@ typedef struct _cef_display_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns the unique identifier for this Display.
--- a/include/capi/views/cef_layout_capi.h
+++ b/include/capi/views/cef_layout_capi.h
@@ -56,7 +56,7 @@ typedef struct _cef_layout_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout.
--- a/include/capi/views/cef_menu_button_capi.h
+++ b/include/capi/views/cef_menu_button_capi.h
@@ -68,12 +68,6 @@ typedef struct _cef_menu_button_t {
  void (CEF_CALLBACK *show_menu)(struct _cef_menu_button_t* self,
      struct _cef_menu_model_t* menu_model, const cef_point_t* screen_point,
      cef_menu_anchor_position_t anchor_position);
-
-  ///
-  // Show the menu for this button. Results in a call to
-  // cef_menu_button_delegate_t::on_menu_button_pressed().
-  ///
-  void (CEF_CALLBACK *trigger_menu)(struct _cef_menu_button_t* self);
 } cef_menu_button_t;


--- a/include/capi/views/cef_view_capi.h
+++ b/include/capi/views/cef_view_capi.h
@@ -61,7 +61,7 @@ typedef struct _cef_view_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Returns this View as a BrowserView or NULL if this is not a BrowserView.
@@ -148,18 +148,6 @@ typedef struct _cef_view_t {
  ///
  void (CEF_CALLBACK *set_id)(struct _cef_view_t* self, int id);

-  ///
-  // Returns the group id of this View, or -1 if not set.
-  ///
-  int (CEF_CALLBACK *get_group_id)(struct _cef_view_t* self);
-
-  ///
-  // A group id is used to tag Views which are part of the same logical group.
-  // Focus can be moved between views with the same group using the arrow keys.
-  // The group id is immutable once it's set.
-  ///
-  void (CEF_CALLBACK *set_group_id)(struct _cef_view_t* self, int group_id);
-
  ///
  // Returns the View that contains this View, if any.
  ///
--- a/include/capi/views/cef_view_delegate_capi.h
+++ b/include/capi/views/cef_view_delegate_capi.h
@@ -55,7 +55,7 @@ typedef struct _cef_view_delegate_t {
  ///
  // Base structure.
  ///
-  cef_base_ref_counted_t base;
+  cef_base_t base;

  ///
  // Return the preferred size for |view|. The Layout will use this information
@@ -105,18 +105,6 @@ typedef struct _cef_view_delegate_t {
  ///
  void (CEF_CALLBACK *on_child_view_changed)(struct _cef_view_delegate_t* self,
      struct _cef_view_t* view, int added, struct _cef_view_t* child);
-
-  ///
-  // Called when |view| gains focus.
-  ///
-  void (CEF_CALLBACK *on_focus)(struct _cef_view_delegate_t* self,
-      struct _cef_view_t* view);
-
-  ///
-  // Called when |view| loses focus.
-  ///
-  void (CEF_CALLBACK *on_blur)(struct _cef_view_delegate_t* self,
-      struct _cef_view_t* view);
 } cef_view_delegate_t;


--- a/include/capi/views/cef_window_capi.h
+++ b/include/capi/views/cef_window_capi.h
@@ -269,27 +269,6 @@ typedef struct _cef_window_t {
  ///
  void (CEF_CALLBACK *send_mouse_events)(struct _cef_window_t* self,
      cef_mouse_button_type_t button, int mouse_down, int mouse_up);
-
-  ///
-  // Set the keyboard accelerator for the specified |command_id|. |key_code| can
-  // be any virtual key or character value. cef_window_delegate_t::OnAccelerator
-  // will be called if the keyboard combination is triggered while this window
-  // has focus.
-  ///
-  void (CEF_CALLBACK *set_accelerator)(struct _cef_window_t* self,
-      int command_id, int key_code, int shift_pressed, int ctrl_pressed,
-      int alt_pressed);
-
-  ///
-  // Remove the keyboard accelerator for the specified |command_id|.
-  ///
-  void (CEF_CALLBACK *remove_accelerator)(struct _cef_window_t* self,
-      int command_id);
-
-  ///
-  // Remove all keyboard accelerators.
-  ///
-  void (CEF_CALLBACK *remove_all_accelerators)(struct _cef_window_t* self);
 } cef_window_t;


--- a/include/capi/views/cef_window_delegate_capi.h
+++ b/include/capi/views/cef_window_delegate_capi.h
@@ -103,22 +103,6 @@ typedef struct _cef_window_delegate_t {
  ///
  int (CEF_CALLBACK *can_close)(struct _cef_window_delegate_t* self,
      struct _cef_window_t* window);
-
-  ///
-  // Called when a keyboard accelerator registered with
-  // cef_window_t::SetAccelerator is triggered. Return true (1) if the
-  // accelerator was handled or false (0) otherwise.
-  ///
-  int (CEF_CALLBACK *on_accelerator)(struct _cef_window_delegate_t* self,
-      struct _cef_window_t* window, int command_id);
-
-  ///
-  // Called after all other controls in the window have had a chance to handle
-  // the event. |event| contains information about the keyboard event. Return
-  // true (1) if the keyboard event was handled or false (0) otherwise.
-  ///
-  int (CEF_CALLBACK *on_key_event)(struct _cef_window_delegate_t* self,
-      struct _cef_window_t* window, const struct _cef_key_event_t* event);
 } cef_window_delegate_t;


--- a/include/cef_app.h
+++ b/include/cef_app.h
@@ -143,7 +143,7 @@ void CefEnableHighDPISupport();
 // called by the process and/or thread indicated.
 ///
 /*--cef(source=client,no_debugct_check)--*/
-class CefApp : public virtual CefBaseRefCounted {
+class CefApp : public virtual CefBase {
 public:
  ///
  // Provides an opportunity to view and/or modify command-line arguments before
@@ -170,7 +170,7 @@ class CefApp : public virtual CefBaseRefCounted {
  ///
  /*--cef()--*/
  virtual void OnRegisterCustomSchemes(
-      CefRawPtr<CefSchemeRegistrar> registrar) {
+      CefRefPtr<CefSchemeRegistrar> registrar) {
  }

  ///
--- a/include/cef_auth_callback.h
+++ b/include/cef_auth_callback.h
@@ -45,12 +45,12 @@
 // requests.
 ///
 /*--cef(source=library)--*/
-class CefAuthCallback : public virtual CefBaseRefCounted {
+class CefAuthCallback : public virtual CefBase {
 public:
  ///
  // Continue the authentication request.
  ///
-  /*--cef(capi_name=cont,optional_param=password)--*/
+  /*--cef(capi_name=cont)--*/
  virtual void Continue(const CefString& username,
                        const CefString& password) =0;

--- a/include/cef_base.h
+++ b/include/cef_base.h
@@ -48,9 +48,10 @@
 #endif

 ///
-// All ref-counted framework classes must extend this class.
+// Interface defining the reference count implementation methods. All framework
+// classes must extend the CefBase class.
 ///
-class CefBaseRefCounted {
+class CefBase {
 public:
  ///
  // Called to increment the reference count for the object. Should be called
@@ -70,15 +71,7 @@ class CefBaseRefCounted {
  virtual bool HasOneRef() const =0;

 protected:
-  virtual ~CefBaseRefCounted() {}
-};
-
-///
-// All scoped framework classes must extend this class.
-///
-class CefBaseScoped {
- public:
-  virtual ~CefBaseScoped() {}
+  virtual ~CefBase() {}
 };

 ///
@@ -148,7 +141,7 @@ class CefRefCount {
 // #include "include/base/cef_lock.h"
 //
 // // Class declaration.
-// class MyClass : public CefBaseRefCounted {
+// class MyClass : public CefBase {
 //  public:
 //   MyClass() : value_(0) {}
 //   // Method that may be called on multiple threads.
--- a/include/cef_browser.h
+++ b/include/cef_browser.h
@@ -58,7 +58,7 @@ class CefClient;
 // this class may only be called on the main thread.
 ///
 /*--cef(source=library)--*/
-class CefBrowser : public virtual CefBaseRefCounted {
+class CefBrowser : public virtual CefBase {
 public:
  ///
  // Returns the browser host object. This method can only be called in the
@@ -197,7 +197,7 @@ class CefBrowser : public virtual CefBaseRefCounted {
 // class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefRunFileDialogCallback : public virtual CefBaseRefCounted {
+class CefRunFileDialogCallback : public virtual CefBase {
 public:
  ///
  // Called asynchronously after the file dialog is dismissed.
@@ -218,7 +218,7 @@ class CefRunFileDialogCallback : public virtual CefBaseRefCounted {
 // this class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
+class CefNavigationEntryVisitor : public virtual CefBase {
 public:
  ///
  // Method that will be executed. Do not keep a reference to |entry| outside of
@@ -240,7 +240,7 @@ class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
 // will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefPdfPrintCallback : public virtual CefBaseRefCounted {
+class CefPdfPrintCallback : public virtual CefBase {
 public:
  ///
  // Method that will be executed when the PDF printing has completed. |path|
@@ -257,7 +257,7 @@ class CefPdfPrintCallback : public virtual CefBaseRefCounted {
 // class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDownloadImageCallback : public virtual CefBaseRefCounted {
+class CefDownloadImageCallback : public virtual CefBase {
 public:
  ///
  // Method that will be executed when the image download has completed.
@@ -280,7 +280,7 @@ class CefDownloadImageCallback : public virtual CefBaseRefCounted {
 // comments.
 ///
 /*--cef(source=library)--*/
-class CefBrowserHost : public virtual CefBaseRefCounted {
+class CefBrowserHost : public virtual CefBase {
 public:
  typedef cef_drag_operations_mask_t DragOperationsMask;
  typedef cef_file_dialog_mode_t FileDialogMode;
@@ -472,15 +472,12 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                          CefRefPtr<CefPdfPrintCallback> callback) =0;

  ///
-  // Search for |searchText|. |identifier| must be a unique ID and these IDs
-  // must strictly increase so that newer requests always have greater IDs than
-  // older requests. If |identifier| is zero or less than the previous ID value
-  // then it will be automatically assigned a new valid ID. |forward| indicates
-  // whether to search forward or backward within the page. |matchCase|
-  // indicates whether the search should be case-sensitive. |findNext| indicates
-  // whether this is the first request or a follow-up. The CefFindHandler
-  // instance, if any, returned via CefClient::GetFindHandler will be called to
-  // report find results.
+  // Search for |searchText|. |identifier| can be used to have multiple searches
+  // running simultaniously. |forward| indicates whether to search forward or
+  // backward within the page. |matchCase| indicates whether the search should
+  // be case-sensitive. |findNext| indicates whether this is the first request
+  // or a follow-up. The CefFindHandler instance, if any, returned via
+  // CefClient::GetFindHandler will be called to report find results.
  ///
  /*--cef()--*/
  virtual void Find(int identifier, const CefString& searchText,
--- a/include/cef_browser_process_handler.h
+++ b/include/cef_browser_process_handler.h
@@ -48,7 +48,7 @@
 // will be called on the browser process main thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
-class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
+class CefBrowserProcessHandler : public virtual CefBase {
 public:
  ///
  // Called on the browser process UI thread immediately after the CEF context
--- a/include/cef_callback.h
+++ b/include/cef_callback.h
@@ -44,7 +44,7 @@
 // Generic callback interface used for asynchronous continuation.
 ///
 /*--cef(source=library)--*/
-class CefCallback : public virtual CefBaseRefCounted {
+class CefCallback : public virtual CefBase {
 public:
  ///
  // Continue processing.
@@ -63,7 +63,7 @@ class CefCallback : public virtual CefBaseRefCounted {
 // Generic callback interface used for asynchronous completion.
 ///
 /*--cef(source=client)--*/
-class CefCompletionCallback : public virtual CefBaseRefCounted {
+class CefCompletionCallback : public virtual CefBase {
 public:
  ///
  // Method that will be called once the task is complete.
--- a/include/cef_client.h
+++ b/include/cef_client.h
@@ -59,7 +59,7 @@
 // Implement this interface to provide handler implementations.
 ///
 /*--cef(source=client,no_debugct_check)--*/
-class CefClient : public virtual CefBaseRefCounted {
+class CefClient : public virtual CefBase {
 public:
  ///
  // Return the handler for context menus. If no handler is provided the default
--- a/include/cef_command_line.h
+++ b/include/cef_command_line.h
@@ -53,7 +53,7 @@
 // used before CefInitialize() is called.
 ///
 /*--cef(source=library,no_debugct_check)--*/
-class CefCommandLine : public virtual CefBaseRefCounted {
+class CefCommandLine : public virtual CefBase {
 public:
  typedef std::vector<CefString> ArgumentList;
  typedef std::map<CefString, CefString> SwitchMap;
--- a/include/cef_context_menu_handler.h
+++ b/include/cef_context_menu_handler.h
@@ -50,7 +50,7 @@ class CefContextMenuParams;
 // Callback interface used for continuation of custom context menu display.
 ///
 /*--cef(source=library)--*/
-class CefRunContextMenuCallback : public virtual CefBaseRefCounted {
+class CefRunContextMenuCallback : public virtual CefBase {
 public:
  typedef cef_event_flags_t EventFlags;

@@ -74,7 +74,7 @@ class CefRunContextMenuCallback : public virtual CefBaseRefCounted {
 // class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefContextMenuHandler : public virtual CefBaseRefCounted {
+class CefContextMenuHandler : public virtual CefBase {
 public:
  typedef cef_event_flags_t EventFlags;

@@ -139,7 +139,7 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted {
 // can only be accessed on browser process the UI thread.
 ///
 /*--cef(source=library)--*/
-class CefContextMenuParams : public virtual CefBaseRefCounted {
+class CefContextMenuParams : public virtual CefBase {
 public:
  typedef cef_context_menu_type_flags_t TypeFlags;
  typedef cef_context_menu_media_type_t MediaType;
--- a/include/cef_cookie.h
+++ b/include/cef_cookie.h
@@ -51,7 +51,7 @@ class CefDeleteCookiesCallback;
 // any thread unless otherwise indicated.
 ///
 /*--cef(source=library,no_debugct_check)--*/
-class CefCookieManager : public virtual CefBaseRefCounted {
+class CefCookieManager : public virtual CefBase {
 public:
  ///
  // Returns the global cookie manager. By default data will be stored at
@@ -171,7 +171,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
 // will always be called on the IO thread.
 ///
 /*--cef(source=client)--*/
-class CefCookieVisitor : public virtual CefBaseRefCounted {
+class CefCookieVisitor : public virtual CefBase {
 public:
  ///
  // Method that will be called once for each cookie. |count| is the 0-based
@@ -191,7 +191,7 @@ class CefCookieVisitor : public virtual CefBaseRefCounted {
 // CefCookieManager::SetCookie().
 ///
 /*--cef(source=client)--*/
-class CefSetCookieCallback : public virtual CefBaseRefCounted {
+class CefSetCookieCallback : public virtual CefBase {
 public:
  ///
  // Method that will be called upon completion. |success| will be true if the
@@ -207,7 +207,7 @@ class CefSetCookieCallback : public virtual CefBaseRefCounted {
 // CefCookieManager::DeleteCookies().
 ///
 /*--cef(source=client)--*/
-class CefDeleteCookiesCallback : public virtual CefBaseRefCounted {
+class CefDeleteCookiesCallback : public virtual CefBase {
 public:
  ///
  // Method that will be called upon completion. |num_deleted| will be the
--- a/include/cef_crash_util.h
+++ b/include/cef_crash_util.h
@@ -54,9 +54,6 @@
 //           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;
@@ -88,12 +85,6 @@
 // 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 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.
@@ -138,7 +129,7 @@ bool CefCrashReportingEnabled();
 ///
 // Sets or clears a specific key-value pair from the crash metadata.
 ///
-/*--cef(optional_param=value)--*/
+/*--cef()--*/
 void CefSetCrashKeyValue(const CefString& key, const CefString& value);

 #endif  // CEF_INCLUDE_CEF_CRASH_UTIL_H_
--- a/include/cef_dialog_handler.h
+++ b/include/cef_dialog_handler.h
@@ -45,7 +45,7 @@
 // Callback interface for asynchronous continuation of file dialog requests.
 ///
 /*--cef(source=library)--*/
-class CefFileDialogCallback : public virtual CefBaseRefCounted {
+class CefFileDialogCallback : public virtual CefBase {
 public:
  ///
  // Continue the file selection. |selected_accept_filter| should be the 0-based
@@ -72,7 +72,7 @@ class CefFileDialogCallback : public virtual CefBaseRefCounted {
 // will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDialogHandler : public virtual CefBaseRefCounted {
+class CefDialogHandler : public virtual CefBase {
 public:
  typedef cef_file_dialog_mode_t FileDialogMode;

--- a/include/cef_display_handler.h
+++ b/include/cef_display_handler.h
@@ -47,7 +47,7 @@
 // The methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDisplayHandler : public virtual CefBaseRefCounted {
+class CefDisplayHandler : public virtual CefBase {
 public:
  ///
  // Called when a frame's address has changed.
--- a/include/cef_dom.h
+++ b/include/cef_dom.h
@@ -49,7 +49,7 @@ class CefDOMNode;
 // be called on the render process main thread.
 ///
 /*--cef(source=client)--*/
-class CefDOMVisitor : public virtual CefBaseRefCounted {
+class CefDOMVisitor : public virtual CefBase {
 public:
  ///
  // Method executed for visiting the DOM. The document object passed to this
@@ -68,7 +68,7 @@ class CefDOMVisitor : public virtual CefBaseRefCounted {
 // be called on the render process main thread thread.
 ///
 /*--cef(source=library)--*/
-class CefDOMDocument : public virtual CefBaseRefCounted {
+class CefDOMDocument : public virtual CefBase {
 public:
  typedef cef_dom_document_type_t Type;

@@ -164,7 +164,7 @@ class CefDOMDocument : public virtual CefBaseRefCounted {
 // called on the render process main thread.
 ///
 /*--cef(source=library)--*/
-class CefDOMNode : public virtual CefBaseRefCounted {
+class CefDOMNode : public virtual CefBase {
 public:
  typedef std::map<CefString, CefString> AttributeMap;
  typedef cef_dom_node_type_t Type;
--- a/include/cef_download_handler.h
+++ b/include/cef_download_handler.h
@@ -47,7 +47,7 @@
 // Callback interface used to asynchronously continue a download.
 ///
 /*--cef(source=library)--*/
-class CefBeforeDownloadCallback : public virtual CefBaseRefCounted {
+class CefBeforeDownloadCallback : public virtual CefBase {
 public:
  ///
  // Call to continue the download. Set |download_path| to the full file path
@@ -64,7 +64,7 @@ class CefBeforeDownloadCallback : public virtual CefBaseRefCounted {
 // Callback interface used to asynchronously cancel a download.
 ///
 /*--cef(source=library)--*/
-class CefDownloadItemCallback : public virtual CefBaseRefCounted {
+class CefDownloadItemCallback : public virtual CefBase {
 public:
  ///
  // Call to cancel the download.
@@ -91,7 +91,7 @@ class CefDownloadItemCallback : public virtual CefBaseRefCounted {
 // on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDownloadHandler : public virtual CefBaseRefCounted {
+class CefDownloadHandler : public virtual CefBase {
 public:
  ///
  // Called before a download begins. |suggested_name| is the suggested name for
--- a/include/cef_download_item.h
+++ b/include/cef_download_item.h
@@ -44,7 +44,7 @@
 // Class used to represent a download item.
 ///
 /*--cef(source=library)--*/
-class CefDownloadItem : public virtual CefBaseRefCounted {
+class CefDownloadItem : public virtual CefBase {
 public:
  ///
  // Returns true if this object is valid. Do not call any other methods if this
--- a/include/cef_drag_data.h
+++ b/include/cef_drag_data.h
@@ -47,7 +47,7 @@
 // on any thread.
 ///
 /*--cef(source=library)--*/
-class CefDragData : public virtual CefBaseRefCounted {
+class CefDragData : public virtual CefBase {
 public:
  ///
  // Create a new CefDragData object.
--- a/include/cef_drag_handler.h
+++ b/include/cef_drag_handler.h
@@ -47,7 +47,7 @@
 // this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefDragHandler : public virtual CefBaseRefCounted {
+class CefDragHandler : public virtual CefBase {
 public:
  typedef cef_drag_operations_mask_t DragOperationsMask;

--- a/include/cef_find_handler.h
+++ b/include/cef_find_handler.h
@@ -46,7 +46,7 @@
 // methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefFindHandler : public virtual CefBaseRefCounted {
+class CefFindHandler : public virtual CefBase {
 public:
  ///
  // Called to report find results returned by CefBrowserHost::Find().
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marshall Greenblatt	f984155b3f	Windows: Fix command line parsing for crash handler (issue #1995 )	2017-01-30 16:18:58 -05:00
Marshall Greenblatt	80bd6062d7	Fix command line parsing for crash handler (issue #1995 )	2017-01-27 14:22:17 -05:00
Marshall Greenblatt	88ff29a56a	Standardize product/version/platform crash keys (issue #1995 )	2017-01-25 14:18:49 -05:00
Marshall Greenblatt	beccb2dd1b	Fix potential OSR crash on renderer process recreation (issue #2082 )	2017-01-25 12:48:33 -05:00
Marshall Greenblatt	6b8ef03a2b	Fix error in patch file generation (issue #2015 )	2017-01-24 18:16:56 -05:00
Marshall Greenblatt	c8ee0ae2ca	Add is_main_frame argument to CefRequestContextHandler::OnBeforePluginLoad (issue #2015 )	2017-01-24 17:54:51 -05:00
Marshall Greenblatt	d6fc4a4c16	Add CefContextMenuParams::GetTitleText method (issue #2030 )	2017-01-17 13:22:08 -05:00
Marshall Greenblatt	8b2618a72a	Fix CefRequestHandler::OnCertificateError callback trigger (issue #2019 )	2017-01-17 13:11:22 -05:00
Marshall Greenblatt	4fdfc02858	cefclient: Fix typo in TempWindow comments	2017-01-17 13:11:22 -05:00
Marshall Greenblatt	d685d27313	Windows: Fix white flash during browser creation (issue #1984 )	2017-01-13 16:35:26 -05:00
Marshall Greenblatt	fd774d81ad	Windows: Fix AppName and ExternalHandler usage in crash_reporter.cfg (issue #1995 )	2017-01-13 15:23:19 -05:00
Marshall Greenblatt	6e0baff75c	Improve crashpad integration (issue #1995 ) - Crash reporting is enabled and configured using a "crash_reporter.cfg" file. See comments in include/cef_crash_util.h and tools/crash_server.py for usage. Add product name and version to crash_reporter.cfg (issue #1995)	2017-01-12 14:43:34 -05:00
Marshall Greenblatt	f264ab9620	Update to Chromium version 55.0.2883.87	2017-01-10 22:06:33 -05:00
Marshall Greenblatt	c993bcadc3	Update copyright year on generated files	2017-01-10 19:25:18 -05:00
Marshall Greenblatt	edbfb207b8	Windows: Fix behavior of frameless windows with Views. - Don't set InitParams::TRANSLUCENT_WINDOW. Setting this resulted in the WS_EX_COMPOSITED style being added and the WS_THICKFRAME style being removed, which disabled Aero Snap. - Remove the non-client border to get a completely frameless window. Having a border is problematic because the top is drawn by Windows while the rest is drawn black. Having Windows draw part of the border is required to enable the window drop shadow (see HWNDMessageHandler::SetDwmFrameExtension). - Delete the remove_caption patches which are no longer required.	2016-12-14 16:57:43 +01:00
Marshall Greenblatt	d7f087e766	Windows: Fix missing InsertAllocatorDispatch symbol in cef_sandbox.lib (issue #2044 )	2016-11-30 19:51:05 -05:00
Marshall Greenblatt	7f76148993	Windows: Fix x64 build conversion from 'size_t' to 'int' error (issue #2054 )	2016-11-30 15:25:08 -05:00
Marshall Greenblatt	7843d6cdff	Update to Chromium version 55.0.2883.59	2016-11-30 00:00:09 -05:00
Marshall Greenblatt	a8ecb191da	Add option to enable/disable net security expiration (issue #1994 ) - Net security (CT, HSTS) expiration based on build age is now disabled by default. - Add new enable_net_security_expiration option to CefSettings and CefRequestContextSettings.	2016-11-18 16:18:03 -05:00
Marshall Greenblatt	6064e023ff	Windows: Fix x64 build conversion from 'size_t' to 'int' error (issue #2043 )	2016-11-18 14:30:26 -05:00
Marshall Greenblatt	a841c0a319	Mac: Fix resource copy when building the binary distrib with Ninja (issue #1632 )	2016-11-18 13:46:41 -05:00
Marshall Greenblatt	fbe14a56a8	Rename unittests to ceftests (issue #1632 )	2016-11-18 13:46:41 -05:00
Marshall Greenblatt	a76670a3ed	Add unittests target to the binary distribution (issue #1632 ) - Move all tests from the top-level directory to tests/. - Move files shared by cefclient and unittests to tests/shared/. - Add a fused (single header/source file) version of gtest in tests/gtest/ with associated CMake configuration. - Test-only headers are now exposed in include/test/. Unit test targets must define UNIT_TEST in order to access them. - Replace usage of USING_CEF_SHARED with WRAPPING_CEF_SHARED for clarity (only the libcef_dll_wrapper target should define it). - Remove the RENAME_DIRECTORY CMake macro which is no longer used. - Remove C++11 usage from unittests sources for compatibility with the binary distribution configuration. - Windows: Fix build errors due to chrome_elf.dll and imm32.lib missing from the CMake configuration.	2016-11-18 13:46:40 -05:00
Marshall Greenblatt	fe419c09ec	Remove Chromium target dependencies for unit tests (issue #1632 )	2016-11-18 13:46:40 -05:00
Marshall Greenblatt	0187add5ae	Remove Chromium includes in unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	9610905541	Remove usage of ui::KeyboardCode in unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	ac9d105c5d	Add CefWaitableEvent interface for unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	9c76128317	Add CefScopedTempDir and file utility functions for unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	b462c19db1	Remove usage of gfx in unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	53b3f1c274	Remove usage of base::StringPrintf in unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	cc0e7d207c	Remove usage of base::WrapUnique in unit tests (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	648b7b243f	Add CefThread interface (issue #1632 )	2016-11-18 13:46:39 -05:00
Marshall Greenblatt	b099f8cb79	Update to Chromium version 55.0.2883.44	2016-11-10 16:13:41 -05:00
Marshall Greenblatt	aeeb51361b	Fix memory leak with IME on macOS (see http://crbug.com/654695 )	2016-11-10 16:13:14 -05:00
Marshall Greenblatt	7a2765f89c	Add initial WebUI support (issue #2037 ) - Visit chrome://webui-hosts for the list of supported hosts.	2016-11-08 20:39:23 -05:00
Marshall Greenblatt	3beb937bcb	Fix cef_time_t.year documentation (issue #1913 )	2016-11-04 17:06:34 -04:00
Marshall Greenblatt	d59682018c	Change index parameter type from int to size_t (issue #1491 )	2016-11-04 15:28:37 -04:00
Marshall Greenblatt	5cea4e312b	Add test for history navigation of pages containing dynamically created iframes (issue #2022 )	2016-11-04 13:54:29 -04:00
Marshall Greenblatt	f7014becfa	Standardize IME callbacks for off-screen rendering (issue #1675 )	2016-11-03 21:12:41 -04:00
Marshall Greenblatt	e30a588a4c	Fix DCHECK while running PDF unit tests (issue #2032 )	2016-11-03 12:48:02 -04:00
Marshall Greenblatt	6e2177b6fa	Disable channel ID support (issue #1912 )	2016-11-02 15:15:30 -04:00
Marshall Greenblatt	666341d24e	Update to Chromium version 55.0.2883.28	2016-11-01 12:45:33 -04:00
Marshall Greenblatt	afbd288efa	Remove mention of automatic type conversion in cef_v8.h (issue #1089 )	2016-10-28 20:54:07 -04:00
Marshall Greenblatt	814fe1e069	Mac: Always set enable_dsyms=true (issue #2027 )	2016-10-28 20:31:52 -04:00
Marshall Greenblatt	ebddf7c5f3	Remove unhelpful context debug checks (issue #1954 )	2016-10-28 16:05:13 -04:00
Marshall Greenblatt	713ddcc96d	Fix URL comparison errors in CefRequest (issue #1967 )	2016-10-28 14:17:30 -04:00
Marshall Greenblatt	ed84471e8a	Fix CefMenuModelDelegate methods missing from the CAPI (issue #2006 )	2016-10-28 13:18:56 -04:00
Marshall Greenblatt	99e95ca434	Fix crash when persisting user preferences (issue #2017 )	2016-10-28 12:39:57 -04:00
Marshall Greenblatt	a6c42a74b1	Fix translator error with X509CertificateList (issue #1824 )	2016-10-27 15:45:53 -04:00
Marshall Greenblatt	67eba55c79	Minor fixes for output consistency	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	97fe56d30c	Add callback for custom certificate selection (issue #1824 )	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	f3598b5ab0	Add V8 interceptor support (issue #1159 )	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	dd8daeb8c9	Fix shutdown assertion with authentication whitelist preferences (issue #1150 )	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	8fc370c9be	Add authentication whitelist preferences (issue #1150 )	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	499813b294	Allow CefV8Context::Eval to bypass CSP (issue #2024 )	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	3a77b243a3	Windows: Fix crash when AVX instructions are not supported (issue #1999 )	2016-10-27 14:47:47 -04:00
Marshall Greenblatt	0ad5d2918b	Add patch tool enhancements (issue #2016 )	2016-10-27 14:47:46 -04:00
Marshall Greenblatt	37753febf5	Fix PDF rendering with OSR (issue #1689 )	2016-10-27 14:47:46 -04:00
Marshall Greenblatt	5cd77e8491	Fix missing browser.enable_spellchecking pref registration (issue #1996 )	2016-10-27 14:47:46 -04:00
Marshall Greenblatt	287664d85f	Update to Chromium version 55.0.2883.21	2016-10-25 20:19:54 -04:00