Add initial support for API versioning (see #3836)

- Generated files are now created when running cef_create_projects or the new version_manager.py tool. These files are still created in the cef/ source tree (same location as before) but Git ignores them due to the generated .gitignore file. - API hashes are committed to Git as a new cef_api_versions.json file. This file is used for both code generation and CEF version calculation (replacing the previous usage of cef_api_hash.h for this purpose). It will be updated by the CEF admin before merging breaking API changes upstream. - As an added benefit to the above, contributor PRs will no longer contain generated code that is susceptible to frequent merge conflicts. - From a code generation perspective, the main difference is that we now use versioned structs (e.g. cef_browser_0_t instead of cef_browser_t) on the libcef (dll/framework) side. Most of the make_*.py tool changes are related to supporting this. - From the client perspective, you can now define CEF_API_VERSION in the project configuration (or get CEF_EXPERIMENTAL by default). This define will change the API exposed in CEF’s include/ and include/capi header files. All client-side targets including libcef_dll_wrapper will need be recompiled when changing this define. - Examples of the new API-related define usage are provided in cef_api_version_test.h, api_version_test_impl.cc and api_version_unittest.cc. To test: - Run `ceftests --gtest_filter=ApiVersionTest.*` - Add `cef_api_version=13300` to GN_DEFINES. Re-run configure, build and ceftests steps. - Repeat with 13301, 13302, 13303 (all supported test versions).
2025-06-05 21:39:12 +02:00 · 2024-12-09 15:20:44 -05:00
parent 219bf3406c
commit dd81904a2f
68 changed files with 7466 additions and 1265 deletions
--- a/include/base/cef_build.h
+++ b/include/base/cef_build.h
@@ -85,7 +85,10 @@
 #endif

 #else  // !USING_CHROMIUM_INCLUDES
+
+#if !defined(GENERATING_CEF_API_HASH)
 #include "include/cef_config.h"
+#endif

 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
--- a/include/capi/cef_base_capi.h
+++ b/include/capi/cef_base_capi.h
@@ -44,62 +44,54 @@ extern "C" {
 #endif

 ///
-// All ref-counted framework structures must include this structure first.
+/// All ref-counted framework structures must include this structure first.
 ///
 typedef struct _cef_base_ref_counted_t {
  ///
-  // Size of the data structure.
+  /// Size of the data structure.
  ///
  size_t size;

  ///
-  // Called to increment the reference count for the object. Should be called
-  // for every new copy of a pointer to a given object.
+  /// 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);

  ///
-  // 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.
+  /// 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);

  ///
-  // Returns true (1) if the current reference count is 1.
+  /// Returns true (1) if the current reference count is 1.
  ///
  int(CEF_CALLBACK* has_one_ref)(struct _cef_base_ref_counted_t* self);

  ///
-  // Returns true (1) if the current reference count is at least 1.
+  /// Returns true (1) if the current reference count is at least 1.
  ///
  int(CEF_CALLBACK* has_at_least_one_ref)(struct _cef_base_ref_counted_t* self);
 } cef_base_ref_counted_t;

 ///
-// All scoped framework structures must include this structure first.
+/// All scoped framework structures must include this structure first.
 ///
 typedef struct _cef_base_scoped_t {
  ///
-  // Size of the data structure.
+  /// Size of the data structure.
  ///
  size_t size;

  ///
-  // Called to delete this object. May be NULL if the object is not owned.
+  /// 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|.
-#define CEF_MEMBER_EXISTS(s, f) \
-  ((intptr_t) &                 \
-   ((s)->f) - (intptr_t)(s) + sizeof((s)->f) <= *reinterpret_cast<size_t*>(s))
-
-#define CEF_MEMBER_MISSING(s, f) (!CEF_MEMBER_EXISTS(s, f) || !((s)->f))
-
 #ifdef __cplusplus
 }
 #endif
--- a/include/cef_api_hash.h
+++ b/include/cef_api_hash.h
@@ -27,45 +27,124 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the make_api_hash_header.py tool.
+// Versions are managed using the version_manager.py tool. For usage details
+// see https://bitbucket.org/chromiumembedded/cef/wiki/ApiVersioning.md
 //

-#ifndef CEF_INCLUDE_API_HASH_H_
-#define CEF_INCLUDE_API_HASH_H_
+#ifndef CEF_INCLUDE_CEF_API_HASH_H_
+#define CEF_INCLUDE_CEF_API_HASH_H_

 #include "include/internal/cef_export.h"

-// The API hash is created by analyzing CEF header files for C API type
-// definitions. The hash value will change when header files are modified in a
-// way that may cause binary incompatibility with other builds. The universal
-// hash value will change if any platform is affected whereas the platform hash
-// values will change only if that particular platform is affected.
-#define CEF_API_HASH_UNIVERSAL "e52a54bfb4cfc13366fe52766756180fc7d3d1b2"
-#if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "ce7bfedc905e90407eb975eebf2f419a347b27cd"
-#elif defined(OS_MAC)
-#define CEF_API_HASH_PLATFORM "8bb21c09270905fe64b8c31f744e0cbf7bc39ff5"
-#elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "a8198f66f731c8ac91bba1e45847807bffca7b01"
+#if !defined(GENERATING_CEF_API_HASH)
+#include "include/cef_api_versions.h"
 #endif

+// Experimental CEF API. Experimental API is unversioned, meaning that it is
+// excluded (compiled out) when clients explicitly set the CEF_API_VERSION
+// value in their project configuration. Experimental API is not back/forward
+// compatible with different CEF versions.
+#define CEF_API_VERSION_EXPERIMENTAL 999999
+
+// Placeholder for the next CEF version currently under development. This is a
+// temporary value that must be replaced with the actual next version number
+// (output of running `version_manager.py -n`) prior to upstream merge. As an
+// added reminder, use of this value will cause version_manager.py to fail when
+// computing hashes for explicit API versions. When adding new API consider
+// using CEF_API_VERSION_EXPERIMENTAL instead.
+#if !defined(CEF_API_VERSION_NEXT)
+#define CEF_API_VERSION_NEXT 999998
+#endif
+
+// Shorter versions of the above for convenience use in comparison macros.
+#define CEF_NEXT CEF_API_VERSION_NEXT
+#define CEF_EXPERIMENTAL CEF_API_VERSION_EXPERIMENTAL
+
+// API version that will be compiled client-side. The experimental (unversioned)
+// API is selected by default. Clients can set the CEF_API_VERSION value in
+// their project configuration to configure an explicit API version. Unlike
+// the experimental API, explicit API versions are back/forward compatible with
+// a specific range of CEF versions.
+#if !defined(CEF_API_VERSION)
+#define CEF_API_VERSION CEF_API_VERSION_EXPERIMENTAL
+#endif
+
+#if !defined(GENERATING_CEF_API_HASH)
+#if CEF_API_VERSION < CEF_API_VERSION_MIN ||                                  \
+    (CEF_API_VERSION > CEF_API_VERSION_LAST && CEF_API_VERSION != CEF_NEXT && \
+     CEF_API_VERSION != CEF_EXPERIMENTAL)
+#error Building with unsupported CEF_API_VERSION value
+#endif
+#endif
+
+#define _CEF_AH_PASTE(a, b, c) a##_##b##_##c
+#define _CEF_AH_EVAL(a, b, c) _CEF_AH_PASTE(a, b, c)
+#define _CEF_AH_DECLARE(version, suffix) \
+  _CEF_AH_EVAL(CEF_API_HASH, version, suffix)
+
+// API hashes for the selected CEF_API_VERSION. API hashes are created for
+// each version by analyzing CEF header files for C API type definitions. The
+// hash value will change when header files are modified in a way that may
+// cause binary incompatibility with other builds. The universal hash value
+// will change if any platform is affected whereas the platform hash values
+// will change only if that particular platform is affected.
+#define CEF_API_HASH_UNIVERSAL _CEF_AH_DECLARE(CEF_API_VERSION, UNIVERSAL)
+#define CEF_API_HASH_PLATFORM _CEF_AH_DECLARE(CEF_API_VERSION, PLATFORM)
+
+#if defined(BUILDING_CEF_SHARED)
+
+#define _CEF_AV_LT(v) 1
+#define _CEF_AV_GE(v) 1
+
+#else  // !defined(BUILDING_CEF_SHARED)
+
+#define _CEF_AV_CMP(v, op) (CEF_API_VERSION op v)
+
+#define _CEF_AV_LT(v) _CEF_AV_CMP(v, <)
+#define _CEF_AV_GE(v) _CEF_AV_CMP(v, >=)
+
+#endif  // !defined(BUILDING_CEF_SHARED)
+
+///
+/// API was added in the specified version.
+///
+#define CEF_API_ADDED(v) _CEF_AV_GE(v)
+
+///
+/// API was removed in the specified version.
+///
+#define CEF_API_REMOVED(v) _CEF_AV_LT(v)
+
+///
+/// API exists only in the specified version range.
+///
+#define CEF_API_RANGE(va, vr) (_CEF_AV_GE(va) && _CEF_AV_LT(vr))
+
 #ifdef __cplusplus
 extern "C" {
 #endif

 ///
-// Returns CEF API hashes for the libcef library. The returned string is owned
-// by the library and should not be freed. The |entry| parameter describes which
-// hash value will be returned:
-// 0 - CEF_API_HASH_PLATFORM
-// 1 - CEF_API_HASH_UNIVERSAL
-// 2 - CEF_COMMIT_HASH (from cef_version.h)
+/// Configures the CEF API version and returns API hashes for the libcef
+/// library. The returned string is owned by the library and should not be
+/// freed. The |version| parameter should be CEF_API_VERSION and any changes to
+/// this value will be ignored after the first call to this method. The |entry|
+/// parameter describes which hash value will be returned:
 ///
-CEF_EXPORT const char* cef_api_hash(int entry);
+/// 0 - CEF_API_HASH_PLATFORM
+/// 1 - CEF_API_HASH_UNIVERSAL
+/// 2 - CEF_COMMIT_HASH (from cef_version.h)
+///
+CEF_EXPORT const char* cef_api_hash(int version, int entry);
+
+///
+/// Returns the CEF API version that was configured by the first call to
+/// cef_api_hash().
+///
+CEF_EXPORT int cef_api_version();

 #ifdef __cplusplus
 }
 #endif
-#endif  // CEF_INCLUDE_API_HASH_H_
+
+#endif  // CEF_INCLUDE_CEF_API_HASH_H_
--- a/include/cef_browser.h
+++ b/include/cef_browser.h
@@ -1022,17 +1022,21 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
  virtual void ExitFullscreen(bool will_cause_resize) = 0;

  ///
-  /// Returns true if a Chrome command is supported and enabled. Values for
-  /// |command_id| can be found in the cef_command_ids.h file. This method can
-  /// only be called on the UI thread. Only used with Chrome style.
+  /// Returns true if a Chrome command is supported and enabled. Use the
+  /// cef_id_for_command_id_name() function for version-safe mapping of command
+  /// IDC names from cef_command_ids.h to version-specific numerical
+  /// |command_id| values. This method can only be called on the UI thread. Only
+  /// used with Chrome style.
  ///
  /*--cef()--*/
  virtual bool CanExecuteChromeCommand(int command_id) = 0;

  ///
-  /// Execute a Chrome command. Values for |command_id| can be found in the
-  /// cef_command_ids.h file. |disposition| provides information about the
-  /// intended command target. Only used with Chrome style.
+  /// Execute a Chrome command. Use the cef_id_for_command_id_name()
+  /// function for version-safe mapping of command IDC names from
+  /// cef_command_ids.h to version-specific numerical |command_id| values.
+  /// |disposition| provides information about the intended command target. Only
+  /// used with Chrome style.
  ///
  /*--cef()--*/
  virtual void ExecuteChromeCommand(
--- a/include/cef_command_handler.h
+++ b/include/cef_command_handler.h
@@ -50,12 +50,13 @@ class CefCommandHandler : public virtual CefBaseRefCounted {
 public:
  ///
  /// Called to execute a Chrome command triggered via menu selection or
-  /// keyboard shortcut. Values for |command_id| can be found in the
-  /// cef_command_ids.h file. |disposition| provides information about the
-  /// intended command target. Return true if the command was handled or false
-  /// for the default implementation. For context menu commands this will be
-  /// called after CefContextMenuHandler::OnContextMenuCommand. Only used with
-  /// Chrome style.
+  /// keyboard shortcut. Use the cef_id_for_command_id_name()
+  /// function for version-safe mapping of command IDC names from
+  /// cef_command_ids.h to version-specific numerical |command_id| values.
+  /// |disposition| provides information about the intended command target.
+  /// Return true if the command was handled or false for the default
+  /// implementation. For context menu commands this will be called after
+  /// CefContextMenuHandler::OnContextMenuCommand. Only used with Chrome style.
  ///
  /*--cef()--*/
  virtual bool OnChromeCommand(CefRefPtr<CefBrowser> browser,
@@ -65,9 +66,11 @@ class CefCommandHandler : public virtual CefBaseRefCounted {
  }

  ///
-  /// Called to check if a Chrome app menu item should be visible. Values for
-  /// |command_id| can be found in the cef_command_ids.h file. Only called for
-  /// menu items that would be visible by default. Only used with Chrome style.
+  /// Called to check if a Chrome app menu item should be visible. Use the
+  /// cef_id_for_command_id_name() function for version-safe mapping of command
+  /// IDC names from cef_command_ids.h to version-specific numerical
+  /// |command_id| values. Only called for menu items that would be visible by
+  /// default. Only used with Chrome style.
  ///
  /*--cef()--*/
  virtual bool IsChromeAppMenuItemVisible(CefRefPtr<CefBrowser> browser,
@@ -76,9 +79,11 @@ class CefCommandHandler : public virtual CefBaseRefCounted {
  }

  ///
-  /// Called to check if a Chrome app menu item should be enabled. Values for
-  /// |command_id| can be found in the cef_command_ids.h file. Only called for
-  /// menu items that would be enabled by default. Only used with Chrome style.
+  /// Called to check if a Chrome app menu item should be enabled. Use the
+  /// cef_id_for_command_id_name() function for version-safe mapping of command
+  /// IDC names from cef_command_ids.h to version-specific numerical
+  /// |command_id| values. Only called for menu items that would be enabled by
+  /// default. Only used with Chrome style.
  ///
  /*--cef()--*/
  virtual bool IsChromeAppMenuItemEnabled(CefRefPtr<CefBrowser> browser,
--- a/include/cef_id_mappers.h
+++ b/include/cef_id_mappers.h
@@ -0,0 +1,89 @@
+// Copyright (c) 2025 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_CEF_ID_MAPPERS_H_
+#define CEF_INCLUDE_CEF_ID_MAPPERS_H_
+#pragma once
+
+///
+/// Helper for declaring a static IDR variable.
+///
+#define CEF_DECLARE_PACK_RESOURCE_ID(name) \
+  static const int name = cef_id_for_pack_resource_name(#name)
+
+///
+/// Helper for declaring a static IDS variable.
+///
+#define CEF_DECLARE_PACK_STRING_ID(name) \
+  static const int name = cef_id_for_pack_string_name(#name)
+
+///
+/// Helper for declaring a static IDC variable.
+///
+#define CEF_DECLARE_COMMAND_ID(name) \
+  static const int name = cef_id_for_command_id_name(#name)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "include/internal/cef_export.h"
+
+///
+/// Returns the numeric ID value for an IDR |name| from cef_pack_resources.h or
+/// -1 if |name| is unrecognized by the current CEF/Chromium build. This
+/// function provides version-safe mapping of resource IDR names to
+/// version-specific numeric ID values. Numeric ID values are likely to change
+/// across CEF/Chromium versions but names generally remain the same.
+///
+CEF_EXPORT int cef_id_for_pack_resource_name(const char* name);
+
+///
+/// Returns the numeric ID value for an IDS |name| from cef_pack_strings.h or -1
+/// if |name| is unrecognized by the current CEF/Chromium build. This function
+/// provides version-safe mapping of string IDS names to version-specific
+/// numeric ID values. Numeric ID values are likely to change across
+/// CEF/Chromium versions but names generally remain the same.
+///
+CEF_EXPORT int cef_id_for_pack_string_name(const char* name);
+
+///
+/// Returns the numeric ID value for an IDC |name| from cef_command_ids.h or -1
+/// if |name| is unrecognized by the current CEF/Chromium build. This function
+/// provides version-safe mapping of command IDC names to version-specific
+/// numeric ID values. Numeric ID values are likely to change across
+/// CEF/Chromium versions but names generally remain the same.
+///
+CEF_EXPORT int cef_id_for_command_id_name(const char* name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CEF_ID_MAPPERS_H_
--- a/include/cef_resource_bundle.h
+++ b/include/cef_resource_bundle.h
@@ -61,16 +61,19 @@ class CefResourceBundle : public virtual CefBaseRefCounted {

  ///
  /// Returns the localized string for the specified |string_id| or an empty
-  /// string if the value is not found. Include cef_pack_strings.h for a listing
-  /// of valid string ID values.
+  /// string if the value is not found. Use the cef_id_for_pack_string_name()
+  /// function for version-safe mapping of string IDS names from
+  /// cef_pack_strings.h to version-specific numerical |string_id| values.
  ///
  /*--cef()--*/
  virtual CefString GetLocalizedString(int string_id) = 0;

  ///
  /// Returns a CefBinaryValue containing the decompressed contents of the
-  /// specified scale independent |resource_id| or NULL if not found. Include
-  /// cef_pack_resources.h for a listing of valid resource ID values.
+  /// specified scale independent |resource_id| or NULL if not found. Use the
+  /// cef_id_for_pack_resource_name() function for version-safe mapping of
+  /// resource IDR names from cef_pack_resources.h to version-specific numerical
+  /// |resource_id| values.
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefBinaryValue> GetDataResource(int resource_id) = 0;
@@ -79,8 +82,10 @@ class CefResourceBundle : public virtual CefBaseRefCounted {
  /// Returns a CefBinaryValue containing the decompressed contents of the
  /// specified |resource_id| nearest the scale factor |scale_factor| or NULL if
  /// not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale
-  /// independent resources or call GetDataResource instead.Include
-  /// cef_pack_resources.h for a listing of valid resource ID values.
+  /// independent resources or call GetDataResource instead. Use the
+  /// cef_id_for_pack_resource_name() function for version-safe mapping of
+  /// resource IDR names from cef_pack_resources.h to version-specific numerical
+  /// |resource_id| values.
  ///
  /*--cef()--*/
  virtual CefRefPtr<CefBinaryValue> GetDataResourceForScale(
--- a/include/cef_resource_bundle_handler.h
+++ b/include/cef_resource_bundle_handler.h
@@ -53,8 +53,10 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
  ///
  /// Called to retrieve a localized translation for the specified |string_id|.
  /// To provide the translation set |string| to the translation string and
-  /// return true. To use the default translation return false. Include
-  /// cef_pack_strings.h for a listing of valid string ID values.
+  /// return true. To use the default translation return false. Use the
+  /// cef_id_for_pack_string_name() function for version-safe mapping of string
+  /// IDS names from cef_pack_strings.h to version-specific numerical
+  /// |string_id| values.
  ///
  /*--cef()--*/
  virtual bool GetLocalizedString(int string_id, CefString& string) = 0;
@@ -64,8 +66,9 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
  /// To provide the resource data set |data| and |data_size| to the data
  /// pointer and size respectively and return true. To use the default resource
  /// data return false. The resource data will not be copied and must remain
-  /// resident in memory. Include cef_pack_resources.h for a listing of valid
-  /// resource ID values.
+  /// resident in memory. Use the cef_id_for_pack_resource_name() function for
+  /// version-safe mapping of resource IDR names from cef_pack_resources.h to
+  /// version-specific numerical |resource_id| values.
  ///
  /*--cef()--*/
  virtual bool GetDataResource(int resource_id,
@@ -77,8 +80,10 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
  /// factor |scale_factor|. To provide the resource data set |data| and
  /// |data_size| to the data pointer and size respectively and return true. To
  /// use the default resource data return false. The resource data will not be
-  /// copied and must remain resident in memory. Include cef_pack_resources.h
-  /// for a listing of valid resource ID values.
+  /// copied and must remain resident in memory. Use the
+  /// cef_id_for_pack_resource_name() function for version-safe mapping of
+  /// resource IDR names from cef_pack_resources.h to version-specific numerical
+  /// |resource_id| values.
  ///
  /*--cef()--*/
  virtual bool GetDataResourceForScale(int resource_id,
--- a/include/cef_version_info.h
+++ b/include/cef_version_info.h
@@ -0,0 +1,62 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_CEF_VERSION_INFO_H_
+#define CEF_INCLUDE_CEF_VERSION_INFO_H_
+
+#include "include/internal/cef_export.h"
+
+#if !defined(GENERATING_CEF_API_HASH)
+#include "include/cef_version.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///
+/// Returns CEF version information for the libcef library. The |entry|
+/// parameter describes which version component will be returned:
+///
+/// 0 - CEF_VERSION_MAJOR
+/// 1 - CEF_VERSION_MINOR
+/// 2 - CEF_VERSION_PATCH
+/// 3 - CEF_COMMIT_NUMBER
+/// 4 - CHROME_VERSION_MAJOR
+/// 5 - CHROME_VERSION_MINOR
+/// 6 - CHROME_VERSION_BUILD
+/// 7 - CHROME_VERSION_PATCH
+///
+CEF_EXPORT int cef_version_info(int entry);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_CEF_VERSION_INFO_H_
--- a/include/internal/cef_export.h
+++ b/include/internal/cef_export.h
@@ -36,9 +36,9 @@

 #if defined(COMPILER_MSVC)

-#ifdef BUILDING_CEF_SHARED
+#if defined(BUILDING_CEF_SHARED)
 #define CEF_EXPORT __declspec(dllexport)
-#elif USING_CEF_SHARED
+#elif defined(USING_CEF_SHARED)
 #define CEF_EXPORT __declspec(dllimport)
 #else
 #define CEF_EXPORT
--- a/include/test/cef_api_version_test.h
+++ b/include/test/cef_api_version_test.h
--- a/include/test/cef_translator_test.h
+++ b/include/test/cef_translator_test.h
@@ -39,8 +39,8 @@
 // be included from unit test targets.
 //

-#ifndef CEF_INCLUDE_TEST_CEF_TEST_H_
-#define CEF_INCLUDE_TEST_CEF_TEST_H_
+#ifndef CEF_INCLUDE_TEST_CEF_TRANSLATOR_TEST_H_
+#define CEF_INCLUDE_TEST_CEF_TRANSLATOR_TEST_H_
 #pragma once

 #if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \
@@ -805,4 +805,4 @@ class CefTranslatorTestScopedClientChild
  virtual int GetOtherValue() = 0;
 };

-#endif  // CEF_INCLUDE_TEST_CEF_TEST_H_
+#endif  // CEF_INCLUDE_TEST_CEF_TRANSLATOR_TEST_H_