diff --git a/BUILD.gn b/BUILD.gn index e73860900..1a367c6b2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -657,8 +657,6 @@ static_library("libcef_static") { "libcef/browser/thread_util.h", "libcef/browser/web_contents_dialog_helper.cc", "libcef/browser/web_contents_dialog_helper.h", - "libcef/browser/web_plugin_impl.cc", - "libcef/browser/web_plugin_impl.h", "libcef/browser/x509_certificate_impl.cc", "libcef/browser/x509_certificate_impl.h", "libcef/browser/x509_cert_principal_impl.cc", diff --git a/cef_paths.gypi b/cef_paths.gypi index 3e41e2aed..f3d2a9d14 100644 --- a/cef_paths.gypi +++ b/cef_paths.gypi @@ -8,7 +8,7 @@ # by hand. See the translator.README.txt file in the tools directory for # more information. # -# $hash=872dedb7e5a2f36745446c3d0c9ad8bd5850adb7$ +# $hash=3d75809bdc9a72a0df9df727981f0796b7ddbbc8$ # { @@ -84,7 +84,6 @@ 'include/cef_v8.h', 'include/cef_values.h', 'include/cef_waitable_event.h', - 'include/cef_web_plugin.h', 'include/cef_x509_certificate.h', 'include/cef_xml_reader.h', 'include/cef_zip_reader.h', @@ -183,7 +182,6 @@ 'include/capi/cef_v8_capi.h', 'include/capi/cef_values_capi.h', 'include/capi/cef_waitable_event_capi.h', - 'include/capi/cef_web_plugin_capi.h', 'include/capi/cef_x509_certificate_capi.h', 'include/capi/cef_xml_reader_capi.h', 'include/capi/cef_zip_reader_capi.h', @@ -500,12 +498,6 @@ 'libcef_dll/ctocpp/views/view_delegate_ctocpp.h', 'libcef_dll/cpptoc/waitable_event_cpptoc.cc', 'libcef_dll/cpptoc/waitable_event_cpptoc.h', - 'libcef_dll/cpptoc/web_plugin_info_cpptoc.cc', - 'libcef_dll/cpptoc/web_plugin_info_cpptoc.h', - 'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc', - 'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h', - 'libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc', - 'libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h', 'libcef_dll/cpptoc/views/window_cpptoc.cc', 'libcef_dll/cpptoc/views/window_cpptoc.h', 'libcef_dll/ctocpp/views/window_delegate_ctocpp.cc', @@ -810,12 +802,6 @@ 'libcef_dll/cpptoc/views/view_delegate_cpptoc.h', 'libcef_dll/ctocpp/waitable_event_ctocpp.cc', 'libcef_dll/ctocpp/waitable_event_ctocpp.h', - 'libcef_dll/ctocpp/web_plugin_info_ctocpp.cc', - 'libcef_dll/ctocpp/web_plugin_info_ctocpp.h', - 'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc', - 'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h', - 'libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc', - 'libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h', 'libcef_dll/ctocpp/views/window_ctocpp.cc', 'libcef_dll/ctocpp/views/window_ctocpp.h', 'libcef_dll/cpptoc/views/window_delegate_cpptoc.cc', diff --git a/include/capi/cef_browser_process_handler_capi.h b/include/capi/cef_browser_process_handler_capi.h index 2a3dc178e..564e802db 100644 --- a/include/capi/cef_browser_process_handler_capi.h +++ b/include/capi/cef_browser_process_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=8c97f9b58c642c144cc37824ad820192640307cb$ +// $hash=ad0a78715daff99c1ec987800b7e5d62196e7100$ // #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_ @@ -70,9 +70,9 @@ typedef struct _cef_browser_process_handler_t { /// // Called before a child process is launched. Will be called on the browser // process UI thread when launching a render process and on the browser - // process IO thread when launching a GPU or plugin process. Provides an - // opportunity to modify the child process command line. Do not keep a - // reference to |command_line| outside of this function. + // process IO thread when launching a GPU process. Provides an opportunity to + // modify the child process command line. Do not keep a reference to + // |command_line| outside of this function. /// void(CEF_CALLBACK* on_before_child_process_launch)( struct _cef_browser_process_handler_t* self, diff --git a/include/capi/cef_context_menu_handler_capi.h b/include/capi/cef_context_menu_handler_capi.h index f83dfa364..524c1bfd8 100644 --- a/include/capi/cef_context_menu_handler_capi.h +++ b/include/capi/cef_context_menu_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=fd33ce439e4379d231b6be16bdc1786f314d98e4$ +// $hash=d007b3dc26f3f049bf67623da8fae59dc75a193b$ // #ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_ @@ -290,8 +290,7 @@ typedef struct _cef_context_menu_params_t { /// // Returns true (1) if the context menu contains items specified by the - // renderer process (for example, plugin placeholder or pepper plugin menu - // items). + // renderer process. /// int(CEF_CALLBACK* is_custom_menu)(struct _cef_context_menu_params_t* self); } cef_context_menu_params_t; diff --git a/include/capi/cef_request_context_handler_capi.h b/include/capi/cef_request_context_handler_capi.h index eb1e08b0c..2be36a796 100644 --- a/include/capi/cef_request_context_handler_capi.h +++ b/include/capi/cef_request_context_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=b44d320d5cceb5022543e8154170b8d276628c76$ +// $hash=b2657a441a701c5ddaca68dc604fd94153a3220f$ // #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_ @@ -45,7 +45,6 @@ #include "include/capi/cef_frame_capi.h" #include "include/capi/cef_request_capi.h" #include "include/capi/cef_resource_request_handler_capi.h" -#include "include/capi/cef_web_plugin_capi.h" #ifdef __cplusplus extern "C" { diff --git a/include/capi/cef_request_handler_capi.h b/include/capi/cef_request_handler_capi.h index 8d63bdd30..ce6eb8e2b 100644 --- a/include/capi/cef_request_handler_capi.h +++ b/include/capi/cef_request_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=4a05a0a7cd4a279ccf8455a3cb2f77de581b597a$ +// $hash=4e19e04de13949f20e63e44542bc0a0eeed46b43$ // #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_ @@ -228,14 +228,6 @@ typedef struct _cef_request_handler_t { struct _cef_x509certificate_t* const* certificates, struct _cef_select_client_certificate_callback_t* callback); - /// - // Called on the browser process UI thread when a plugin has crashed. - // |plugin_path| is the path of the plugin that crashed. - /// - void(CEF_CALLBACK* on_plugin_crashed)(struct _cef_request_handler_t* self, - struct _cef_browser_t* browser, - const cef_string_t* plugin_path); - /// // Called on the browser process UI thread when the render view associated // with |browser| is ready to receive/handle IPC messages in the render diff --git a/include/capi/cef_web_plugin_capi.h b/include/capi/cef_web_plugin_capi.h deleted file mode 100644 index 441c2932f..000000000 --- a/include/capi/cef_web_plugin_capi.h +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the name Chromium Embedded -// Framework nor the names of its contributors may be used to endorse -// or promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool and should not edited -// by hand. See the translator.README.txt file in the tools directory for -// more information. -// -// $hash=896d403c7765e7149c7b30387de4c5fa5012f9f9$ -// - -#ifndef CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_ -#define CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_ -#pragma once - -#include "include/capi/cef_base_capi.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct _cef_browser_t; - -/// -// Information about a specific web plugin. -/// -typedef struct _cef_web_plugin_info_t { - /// - // Base structure. - /// - cef_base_ref_counted_t base; - - /// - // Returns the plugin name. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK* get_name)( - struct _cef_web_plugin_info_t* self); - - /// - // Returns the plugin file path (DLL/bundle/library). - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK* get_path)( - struct _cef_web_plugin_info_t* self); - - /// - // Returns the version of the plugin (may be OS-specific). - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK* get_version)( - struct _cef_web_plugin_info_t* self); - - /// - // Returns a description of the plugin from the version information. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK* get_description)( - struct _cef_web_plugin_info_t* self); -} cef_web_plugin_info_t; - -/// -// Structure to implement for visiting web plugin information. The functions of -// this structure will be called on the browser process UI thread. -/// -typedef struct _cef_web_plugin_info_visitor_t { - /// - // Base structure. - /// - cef_base_ref_counted_t base; - - /// - // Method that will be called once for each plugin. |count| is the 0-based - // index for the current plugin. |total| is the total number of plugins. - // Return false (0) to stop visiting plugins. This function may never be - // called if no plugins are found. - /// - int(CEF_CALLBACK* visit)(struct _cef_web_plugin_info_visitor_t* self, - struct _cef_web_plugin_info_t* info, - int count, - int total); -} cef_web_plugin_info_visitor_t; - -/// -// Structure to implement for receiving unstable plugin information. The -// functions of this structure will be called on the browser process IO thread. -/// -typedef struct _cef_web_plugin_unstable_callback_t { - /// - // Base structure. - /// - cef_base_ref_counted_t base; - - /// - // Method that will be called for the requested plugin. |unstable| will be - // true (1) if the plugin has reached the crash count threshold of 3 times in - // 120 seconds. - /// - void(CEF_CALLBACK* is_unstable)( - struct _cef_web_plugin_unstable_callback_t* self, - const cef_string_t* path, - int unstable); -} cef_web_plugin_unstable_callback_t; - -/// -// Visit web plugin information. Can be called on any thread in the browser -// process. -/// -CEF_EXPORT void cef_visit_web_plugin_info( - cef_web_plugin_info_visitor_t* visitor); - -/// -// Cause the plugin list to refresh the next time it is accessed regardless of -// whether it has already been loaded. Can be called on any thread in the -// browser process. -/// -CEF_EXPORT void cef_refresh_web_plugins(void); - -/// -// Unregister an internal plugin. This may be undone the next time -// cef_refresh_web_plugins() is called. Can be called on any thread in the -// browser process. -/// -CEF_EXPORT void cef_unregister_internal_web_plugin(const cef_string_t* path); - -/// -// Register a plugin crash. Can be called on any thread in the browser process -// but will be executed on the IO thread. -/// -CEF_EXPORT void cef_register_web_plugin_crash(const cef_string_t* path); - -/// -// Query if a plugin is unstable. Can be called on any thread in the browser -// process. -/// -CEF_EXPORT void cef_is_web_plugin_unstable( - const cef_string_t* path, - cef_web_plugin_unstable_callback_t* callback); - -#ifdef __cplusplus -} -#endif - -#endif // CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_ diff --git a/include/cef_api_hash.h b/include/cef_api_hash.h index 0e988b453..4fa2c3155 100644 --- a/include/cef_api_hash.h +++ b/include/cef_api_hash.h @@ -42,13 +42,13 @@ // 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 "bb546bf4f8f1347fc6f0811c6642be211e891073" +#define CEF_API_HASH_UNIVERSAL "34a2f684956b2ba6aafca87726f3eab787fd6d4b" #if defined(OS_WIN) -#define CEF_API_HASH_PLATFORM "e8d30cbf12066e78df3a1d6ee433afb3a16dbe99" +#define CEF_API_HASH_PLATFORM "1aad5c9ac4688828d2b995b1031d8a951a2e22b7" #elif defined(OS_MAC) -#define CEF_API_HASH_PLATFORM "1e7c396539f3d381d03e10d6b21e61ec5112bd76" +#define CEF_API_HASH_PLATFORM "4c60742c0b53316b18bbce48a1be1ce665df3960" #elif defined(OS_LINUX) -#define CEF_API_HASH_PLATFORM "89309607fa2eda0ad89bcfc619182bf67a249a8a" +#define CEF_API_HASH_PLATFORM "5ea8a284ce48f26c396a93ef3ea68ce22ec517bf" #endif #ifdef __cplusplus diff --git a/include/cef_browser_process_handler.h b/include/cef_browser_process_handler.h index 335c5cf72..29c54a4ed 100644 --- a/include/cef_browser_process_handler.h +++ b/include/cef_browser_process_handler.h @@ -60,9 +60,9 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted { /// // Called before a child process is launched. Will be called on the browser // process UI thread when launching a render process and on the browser - // process IO thread when launching a GPU or plugin process. Provides an - // opportunity to modify the child process command line. Do not keep a - // reference to |command_line| outside of this method. + // process IO thread when launching a GPU process. Provides an opportunity to + // modify the child process command line. Do not keep a reference to + // |command_line| outside of this method. /// /*--cef()--*/ virtual void OnBeforeChildProcessLaunch( diff --git a/include/cef_context_menu_handler.h b/include/cef_context_menu_handler.h index 61ff67ab6..9874ba1b2 100644 --- a/include/cef_context_menu_handler.h +++ b/include/cef_context_menu_handler.h @@ -277,7 +277,7 @@ class CefContextMenuParams : public virtual CefBaseRefCounted { /// // Returns true if the context menu contains items specified by the renderer - // process (for example, plugin placeholder or pepper plugin menu items). + // process. /// /*--cef()--*/ virtual bool IsCustomMenu() = 0; diff --git a/include/cef_request_context_handler.h b/include/cef_request_context_handler.h index 3bf495dda..3137ecc8e 100644 --- a/include/cef_request_context_handler.h +++ b/include/cef_request_context_handler.h @@ -43,7 +43,6 @@ #include "include/cef_frame.h" #include "include/cef_request.h" #include "include/cef_resource_request_handler.h" -#include "include/cef_web_plugin.h" /// // Implement this interface to provide handler implementations. The handler @@ -53,8 +52,6 @@ /*--cef(source=client,no_debugct_check)--*/ class CefRequestContextHandler : public virtual CefBaseRefCounted { public: - typedef cef_plugin_policy_t PluginPolicy; - /// // Called on the browser process UI thread immediately after the request // context has been initialized. diff --git a/include/cef_request_handler.h b/include/cef_request_handler.h index 6ebbfd298..42dfe70d0 100644 --- a/include/cef_request_handler.h +++ b/include/cef_request_handler.h @@ -228,14 +228,6 @@ class CefRequestHandler : public virtual CefBaseRefCounted { return false; } - /// - // Called on the browser process UI thread when a plugin has crashed. - // |plugin_path| is the path of the plugin that crashed. - /// - /*--cef()--*/ - virtual void OnPluginCrashed(CefRefPtr browser, - const CefString& plugin_path) {} - /// // Called on the browser process UI thread when the render view associated // with |browser| is ready to receive/handle IPC messages in the render diff --git a/include/cef_sandbox_mac.h b/include/cef_sandbox_mac.h index 9b4ad52cb..9ed83bd1b 100644 --- a/include/cef_sandbox_mac.h +++ b/include/cef_sandbox_mac.h @@ -40,11 +40,11 @@ extern "C" { #endif -// The sandbox is used to restrict sub-processes (renderer, plugin, GPU, etc) -// from directly accessing system resources. This helps to protect the user -// from untrusted and potentially malicious Web content. -// See http://www.chromium.org/developers/design-documents/sandbox for -// complete details. +// The sandbox is used to restrict sub-processes (renderer, GPU, etc) from +// directly accessing system resources. This helps to protect the user from +// untrusted and potentially malicious Web content. See +// http://www.chromium.org/developers/design-documents/sandbox for complete +// details. // // To enable the sandbox on macOS the following requirements must be met: // 1. Link the helper process executable with the cef_sandbox static library. diff --git a/include/cef_sandbox_win.h b/include/cef_sandbox_win.h index ca839446b..8d53af953 100644 --- a/include/cef_sandbox_win.h +++ b/include/cef_sandbox_win.h @@ -39,11 +39,11 @@ extern "C" { #endif -// The sandbox is used to restrict sub-processes (renderer, plugin, GPU, etc) -// from directly accessing system resources. This helps to protect the user -// from untrusted and potentially malicious Web content. -// See http://www.chromium.org/developers/design-documents/sandbox for -// complete details. +// The sandbox is used to restrict sub-processes (renderer, GPU, etc) from +// directly accessing system resources. This helps to protect the user from +// untrusted and potentially malicious Web content. See +// http://www.chromium.org/developers/design-documents/sandbox for complete +// details. // // To enable the sandbox on Windows the following requirements must be met: // 1. Use the same executable for the browser process and all sub-processes. diff --git a/include/cef_web_plugin.h b/include/cef_web_plugin.h deleted file mode 100644 index 2ffd572a5..000000000 --- a/include/cef_web_plugin.h +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the name Chromium Embedded -// Framework nor the names of its contributors may be used to endorse -// or promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// --------------------------------------------------------------------------- -// -// The contents of this file must follow a specific format in order to -// support the CEF translator tool. See the translator.README.txt file in the -// tools directory for more information. -// - -#ifndef CEF_INCLUDE_CEF_WEB_PLUGIN_H_ -#define CEF_INCLUDE_CEF_WEB_PLUGIN_H_ - -#include "include/cef_base.h" - -class CefBrowser; - -/// -// Information about a specific web plugin. -/// -/*--cef(source=library)--*/ -class CefWebPluginInfo : public virtual CefBaseRefCounted { - public: - /// - // Returns the plugin name. - /// - /*--cef()--*/ - virtual CefString GetName() = 0; - - /// - // Returns the plugin file path (DLL/bundle/library). - /// - /*--cef()--*/ - virtual CefString GetPath() = 0; - - /// - // Returns the version of the plugin (may be OS-specific). - /// - /*--cef()--*/ - virtual CefString GetVersion() = 0; - - /// - // Returns a description of the plugin from the version information. - /// - /*--cef()--*/ - virtual CefString GetDescription() = 0; -}; - -/// -// Interface to implement for visiting web plugin information. The methods of -// this class will be called on the browser process UI thread. -/// -/*--cef(source=client)--*/ -class CefWebPluginInfoVisitor : public virtual CefBaseRefCounted { - public: - /// - // Method that will be called once for each plugin. |count| is the 0-based - // index for the current plugin. |total| is the total number of plugins. - // Return false to stop visiting plugins. This method may never be called if - // no plugins are found. - /// - /*--cef()--*/ - virtual bool Visit(CefRefPtr info, - int count, - int total) = 0; -}; - -/// -// Visit web plugin information. Can be called on any thread in the browser -// process. -/// -/*--cef()--*/ -void CefVisitWebPluginInfo(CefRefPtr visitor); - -/// -// Cause the plugin list to refresh the next time it is accessed regardless -// of whether it has already been loaded. Can be called on any thread in the -// browser process. -/// -/*--cef()--*/ -void CefRefreshWebPlugins(); - -/// -// Unregister an internal plugin. This may be undone the next time -// CefRefreshWebPlugins() is called. Can be called on any thread in the browser -// process. -/// -/*--cef()--*/ -void CefUnregisterInternalWebPlugin(const CefString& path); - -/// -// Register a plugin crash. Can be called on any thread in the browser process -// but will be executed on the IO thread. -/// -/*--cef()--*/ -void CefRegisterWebPluginCrash(const CefString& path); - -/// -// Interface to implement for receiving unstable plugin information. The methods -// of this class will be called on the browser process IO thread. -/// -/*--cef(source=client)--*/ -class CefWebPluginUnstableCallback : public virtual CefBaseRefCounted { - public: - /// - // Method that will be called for the requested plugin. |unstable| will be - // true if the plugin has reached the crash count threshold of 3 times in 120 - // seconds. - /// - /*--cef()--*/ - virtual void IsUnstable(const CefString& path, bool unstable) = 0; -}; - -/// -// Query if a plugin is unstable. Can be called on any thread in the browser -// process. -/// -/*--cef()--*/ -void CefIsWebPluginUnstable(const CefString& path, - CefRefPtr callback); - -#endif // CEF_INCLUDE_CEF_WEB_PLUGIN_H_ diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index 024e64c40..98788d769 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -577,12 +577,6 @@ typedef struct _cef_browser_settings_t { /// cef_state_t javascript_dom_paste; - /// - // Controls whether any plugins will be loaded. Also configurable using the - // "disable-plugins" command-line switch. - /// - cef_state_t plugins; - /// // Controls whether image URLs will be loaded from the network. A cached image // will still be rendered if requested. Also configurable using the @@ -2459,32 +2453,6 @@ typedef enum { SCALE_FACTOR_300P, } cef_scale_factor_t; -/// -// Plugin policies supported by CefRequestContextHandler::OnBeforePluginLoad. -/// -typedef enum { - /// - // Allow the content. - /// - PLUGIN_POLICY_ALLOW, - - /// - // Allow important content and block unimportant content based on heuristics. - // The user can manually load blocked content. - /// - PLUGIN_POLICY_DETECT_IMPORTANT, - - /// - // Block the content. The user can manually load blocked content. - /// - PLUGIN_POLICY_BLOCK, - - /// - // Disable the content. The user cannot load disabled content. - /// - PLUGIN_POLICY_DISABLE, -} cef_plugin_policy_t; - /// // Policy for how the Referrer HTTP header value will be sent during navigation. // If the `--no-referrers` command-line flag is specified then the policy value diff --git a/include/internal/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h index 98dfe5d6e..09df6f556 100644 --- a/include/internal/cef_types_wrappers.h +++ b/include/internal/cef_types_wrappers.h @@ -704,7 +704,6 @@ struct CefBrowserSettingsTraits { target->javascript_close_windows = src->javascript_close_windows; target->javascript_access_clipboard = src->javascript_access_clipboard; target->javascript_dom_paste = src->javascript_dom_paste; - target->plugins = src->plugins; target->image_loading = src->image_loading; target->image_shrink_standalone_to_fit = src->image_shrink_standalone_to_fit; diff --git a/libcef/browser/alloy/alloy_content_browser_client.cc b/libcef/browser/alloy/alloy_content_browser_client.cc index dec3fe7a5..c9dc0c4ce 100644 --- a/libcef/browser/alloy/alloy_content_browser_client.cc +++ b/libcef/browser/alloy/alloy_content_browser_client.cc @@ -752,7 +752,6 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches( static const char* const kSwitchNames[] = { switches::kDisableExtensions, switches::kDisablePdfExtension, - switches::kDisablePlugins, switches::kDisablePrintPreview, switches::kDisableScrollBounce, switches::kDisableSpellChecking, diff --git a/libcef/browser/browser_contents_delegate.cc b/libcef/browser/browser_contents_delegate.cc index 0a12af6d2..2083a1657 100644 --- a/libcef/browser/browser_contents_delegate.cc +++ b/libcef/browser/browser_contents_delegate.cc @@ -441,16 +441,6 @@ void CefBrowserContentsDelegate::TitleWasSet(content::NavigationEntry* entry) { OnTitleChange(web_contents()->GetTitle()); } -void CefBrowserContentsDelegate::PluginCrashed( - const base::FilePath& plugin_path, - base::ProcessId plugin_pid) { - if (auto c = client()) { - if (auto handler = c->GetRequestHandler()) { - handler->OnPluginCrashed(browser(), plugin_path.value()); - } - } -} - void CefBrowserContentsDelegate::DidUpdateFaviconURL( content::RenderFrameHost* render_frame_host, const std::vector& candidates) { diff --git a/libcef/browser/browser_contents_delegate.h b/libcef/browser/browser_contents_delegate.h index 9b7007935..34555dea8 100644 --- a/libcef/browser/browser_contents_delegate.h +++ b/libcef/browser/browser_contents_delegate.h @@ -131,8 +131,6 @@ class CefBrowserContentsDelegate : public content::WebContentsDelegate, const GURL& validated_url, int error_code) override; void TitleWasSet(content::NavigationEntry* entry) override; - void PluginCrashed(const base::FilePath& plugin_path, - base::ProcessId plugin_pid) override; void DidUpdateFaviconURL( content::RenderFrameHost* render_frame_host, const std::vector& candidates) override; diff --git a/libcef/browser/net/chrome_scheme_handler.cc b/libcef/browser/net/chrome_scheme_handler.cc index 533483340..1faa87558 100644 --- a/libcef/browser/net/chrome_scheme_handler.cc +++ b/libcef/browser/net/chrome_scheme_handler.cc @@ -11,7 +11,6 @@ #include #include "include/cef_version.h" -#include "include/cef_web_plugin.h" #include "libcef/browser/extensions/chrome_api_registration.h" #include "libcef/browser/frame_host_impl.h" #include "libcef/browser/net/internal_scheme_handler.h" diff --git a/libcef/browser/prefs/renderer_prefs.cc b/libcef/browser/prefs/renderer_prefs.cc index 427172440..87ec5f58a 100644 --- a/libcef/browser/prefs/renderer_prefs.cc +++ b/libcef/browser/prefs/renderer_prefs.cc @@ -242,8 +242,6 @@ void SetCommandLinePrefDefaults(CommandLinePrefStore* prefs) { SetBool(prefs, prefs::kWebKitLoadsImagesAutomatically, false); if (command_line->HasSwitch(switches::kDisableTabToLinks)) SetBool(prefs, prefs::kWebkitTabsToLinks, false); - if (command_line->HasSwitch(switches::kDisablePlugins)) - SetBool(prefs, prefs::kWebKitPluginsEnabled, false); } void SetDefaultPrefs(blink::web_pref::WebPreferences& web) { @@ -317,7 +315,6 @@ void SetCefPrefs(const CefBrowserSettings& cef, SET_STATE(cef.javascript_access_clipboard, web.javascript_can_access_clipboard); SET_STATE(cef.javascript_dom_paste, web.dom_paste_enabled); - SET_STATE(cef.plugins, web.plugins_enabled); SET_STATE(cef.image_loading, web.loads_images_automatically); SET_STATE(cef.image_shrink_standalone_to_fit, web.shrinks_standalone_images_to_fit); diff --git a/libcef/browser/web_plugin_impl.cc b/libcef/browser/web_plugin_impl.cc deleted file mode 100644 index b9e414e26..000000000 --- a/libcef/browser/web_plugin_impl.cc +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. - -#include "libcef/browser/web_plugin_impl.h" - -#include "libcef/browser/context.h" -#include "libcef/browser/thread_util.h" - -#include "base/bind.h" -#include "base/files/file_path.h" -#include "content/browser/plugin_service_impl.h" - -namespace { - -void PluginsCallbackImpl( - CefRefPtr visitor, - const std::vector& all_plugins) { - CEF_REQUIRE_UIT(); - - int count = 0; - int total = static_cast(all_plugins.size()); - - std::vector::const_iterator it = all_plugins.begin(); - for (; it != all_plugins.end(); ++it, ++count) { - CefRefPtr info(new CefWebPluginInfoImpl(*it)); - if (!visitor->Visit(info.get(), count, total)) - break; - } -} - -} // namespace - -// CefWebPluginInfoImpl - -CefWebPluginInfoImpl::CefWebPluginInfoImpl( - const content::WebPluginInfo& plugin_info) - : plugin_info_(plugin_info) {} - -CefString CefWebPluginInfoImpl::GetName() { - return plugin_info_.name; -} - -CefString CefWebPluginInfoImpl::GetPath() { - return plugin_info_.path.value(); -} - -CefString CefWebPluginInfoImpl::GetVersion() { - return plugin_info_.version; -} - -CefString CefWebPluginInfoImpl::GetDescription() { - return plugin_info_.desc; -} - -// Global functions. - -void CefVisitWebPluginInfo(CefRefPtr visitor) { - // Verify that the context is in a valid state. - if (!CONTEXT_STATE_VALID()) { - NOTREACHED() << "context not valid"; - return; - } - - if (!visitor.get()) { - NOTREACHED() << "invalid parameter"; - return; - } - - if (CEF_CURRENTLY_ON_UIT()) { - content::PluginServiceImpl::GetInstance()->GetPlugins( - base::BindOnce(PluginsCallbackImpl, visitor)); - } else { - // Execute on the UI thread. - CEF_POST_TASK(CEF_UIT, base::BindOnce(CefVisitWebPluginInfo, visitor)); - } -} - -void CefRefreshWebPlugins() { - // Verify that the context is in a valid state. - if (!CONTEXT_STATE_VALID()) { - NOTREACHED() << "context not valid"; - return; - } - - // No thread affinity. - content::PluginServiceImpl::GetInstance()->RefreshPlugins(); -} - -void CefUnregisterInternalWebPlugin(const CefString& path) { - // Verify that the context is in a valid state. - if (!CONTEXT_STATE_VALID()) { - NOTREACHED() << "context not valid"; - return; - } - - if (path.empty()) { - NOTREACHED() << "invalid parameter"; - return; - } - - // No thread affinity. - content::PluginServiceImpl::GetInstance()->UnregisterInternalPlugin( - base::FilePath(path)); -} - -void CefRegisterWebPluginCrash(const CefString& path) { - // Verify that the context is in a valid state. - if (!CONTEXT_STATE_VALID()) { - NOTREACHED() << "context not valid"; - return; - } - - if (path.empty()) { - NOTREACHED() << "invalid parameter"; - return; - } - - if (CEF_CURRENTLY_ON_IOT()) { - content::PluginServiceImpl::GetInstance()->RegisterPluginCrash( - base::FilePath(path)); - } else { - // Execute on the IO thread. - CEF_POST_TASK(CEF_IOT, base::BindOnce(CefRegisterWebPluginCrash, path)); - } -} - -void CefIsWebPluginUnstable(const CefString& path, - CefRefPtr callback) { - // Verify that the context is in a valid state. - if (!CONTEXT_STATE_VALID()) { - NOTREACHED() << "context not valid"; - return; - } - - if (path.empty() || !callback.get()) { - NOTREACHED() << "invalid parameter"; - return; - } - - if (CEF_CURRENTLY_ON_IOT()) { - callback->IsUnstable( - path, content::PluginServiceImpl::GetInstance()->IsPluginUnstable( - base::FilePath(path))); - } else { - // Execute on the IO thread. - CEF_POST_TASK(CEF_IOT, - base::BindOnce(CefIsWebPluginUnstable, path, callback)); - } -} diff --git a/libcef/browser/web_plugin_impl.h b/libcef/browser/web_plugin_impl.h deleted file mode 100644 index 2e5842536..000000000 --- a/libcef/browser/web_plugin_impl.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. - -#ifndef CEF_LIBCEF_BROWSER_WEB_PLUGIN_IMPL_H_ -#define CEF_LIBCEF_BROWSER_WEB_PLUGIN_IMPL_H_ -#pragma once - -#include "content/public/common/webplugininfo.h" -#include "include/cef_web_plugin.h" - -class CefWebPluginInfoImpl : public CefWebPluginInfo { - public: - explicit CefWebPluginInfoImpl(const content::WebPluginInfo& plugin_info); - - CefString GetName() override; - CefString GetPath() override; - CefString GetVersion() override; - CefString GetDescription() override; - - private: - content::WebPluginInfo plugin_info_; - - IMPLEMENT_REFCOUNTING(CefWebPluginInfoImpl); -}; - -#endif // CEF_LIBCEF_BROWSER_WEB_PLUGIN_IMPL_H_ diff --git a/libcef/common/cef_switches.cc b/libcef/common/cef_switches.cc index e1b112cb5..deadd2c65 100644 --- a/libcef/common/cef_switches.cc +++ b/libcef/common/cef_switches.cc @@ -61,9 +61,6 @@ const char kDisableTextAreaResize[] = "disable-text-area-resize"; // Disable using the tab key to advance focus to links. const char kDisableTabToLinks[] = "disable-tab-to-links"; -// Disable plugins. -const char kDisablePlugins[] = "disable-plugins"; - // Persist session cookies. const char kPersistSessionCookies[] = "persist-session-cookies"; @@ -94,16 +91,6 @@ const char kDisableScrollBounce[] = "disable-scroll-bounce"; // Disable the PDF extension. const char kDisablePdfExtension[] = "disable-pdf-extension"; -// Default plugin policy action. -const char kPluginPolicy[] = "plugin-policy"; -// Allow the content. This is the default value. -const char kPluginPolicy_Allow[] = "allow"; -// Allow important content and block unimportant content based on heuristics. -// The user can manually load blocked content. -const char kPluginPolicy_Detect[] = "detect"; -// Block the content. The user can manually load blocked content. -const char kPluginPolicy_Block[] = "block"; - // Expose preferences used only by unit tests. const char kEnablePreferenceTesting[] = "enable-preference-testing"; diff --git a/libcef/common/cef_switches.h b/libcef/common/cef_switches.h index ae450ab98..8a83dcfb2 100644 --- a/libcef/common/cef_switches.h +++ b/libcef/common/cef_switches.h @@ -33,7 +33,6 @@ extern const char kDisableImageLoading[]; extern const char kImageShrinkStandaloneToFit[]; extern const char kDisableTextAreaResize[]; extern const char kDisableTabToLinks[]; -extern const char kDisablePlugins[]; extern const char kPersistSessionCookies[]; extern const char kPersistUserPreferences[]; extern const char kEnableMediaStream[]; @@ -44,10 +43,6 @@ extern const char kEnableSpellingService[]; extern const char kOverrideSpellCheckLang[]; extern const char kDisableScrollBounce[]; extern const char kDisablePdfExtension[]; -extern const char kPluginPolicy[]; -extern const char kPluginPolicy_Allow[]; -extern const char kPluginPolicy_Detect[]; -extern const char kPluginPolicy_Block[]; extern const char kEnablePreferenceTesting[]; extern const char kEnablePrintPreview[]; extern const char kDisableNewBrowserInfoTimeout[]; diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.cc b/libcef_dll/cpptoc/request_handler_cpptoc.cc index 467a0a4dc..ebff29036 100644 --- a/libcef_dll/cpptoc/request_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fa45e2603966fc7a6c93c930dd4c03692cf10fd2$ +// $hash=4e9587e1eaf8aef5f0457537b70ebcc3ee68c449$ // #include "libcef_dll/cpptoc/request_handler_cpptoc.h" @@ -329,31 +329,6 @@ int CEF_CALLBACK request_handler_on_select_client_certificate( return _retval; } -void CEF_CALLBACK -request_handler_on_plugin_crashed(struct _cef_request_handler_t* self, - cef_browser_t* browser, - const cef_string_t* plugin_path) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return; - // Verify param: browser; type: refptr_diff - DCHECK(browser); - if (!browser) - return; - // Verify param: plugin_path; type: string_byref_const - DCHECK(plugin_path); - if (!plugin_path) - return; - - // Execute - CefRequestHandlerCppToC::Get(self)->OnPluginCrashed( - CefBrowserCToCpp::Wrap(browser), CefString(plugin_path)); -} - void CEF_CALLBACK request_handler_on_render_view_ready(struct _cef_request_handler_t* self, cef_browser_t* browser) { @@ -429,7 +404,6 @@ CefRequestHandlerCppToC::CefRequestHandlerCppToC() { GetStruct()->on_certificate_error = request_handler_on_certificate_error; GetStruct()->on_select_client_certificate = request_handler_on_select_client_certificate; - GetStruct()->on_plugin_crashed = request_handler_on_plugin_crashed; GetStruct()->on_render_view_ready = request_handler_on_render_view_ready; GetStruct()->on_render_process_terminated = request_handler_on_render_process_terminated; diff --git a/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc b/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc deleted file mode 100644 index 36698f5db..000000000 --- a/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=f251bc08b09854c1d999ef9d88706ceeba3a9259$ -// - -#include "libcef_dll/cpptoc/web_plugin_info_cpptoc.h" -#include "libcef_dll/shutdown_checker.h" - -namespace { - -// MEMBER FUNCTIONS - Body may be edited by hand. - -cef_string_userfree_t CEF_CALLBACK -web_plugin_info_get_name(struct _cef_web_plugin_info_t* self) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return NULL; - - // Execute - CefString _retval = CefWebPluginInfoCppToC::Get(self)->GetName(); - - // Return type: string - return _retval.DetachToUserFree(); -} - -cef_string_userfree_t CEF_CALLBACK -web_plugin_info_get_path(struct _cef_web_plugin_info_t* self) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return NULL; - - // Execute - CefString _retval = CefWebPluginInfoCppToC::Get(self)->GetPath(); - - // Return type: string - return _retval.DetachToUserFree(); -} - -cef_string_userfree_t CEF_CALLBACK -web_plugin_info_get_version(struct _cef_web_plugin_info_t* self) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return NULL; - - // Execute - CefString _retval = CefWebPluginInfoCppToC::Get(self)->GetVersion(); - - // Return type: string - return _retval.DetachToUserFree(); -} - -cef_string_userfree_t CEF_CALLBACK -web_plugin_info_get_description(struct _cef_web_plugin_info_t* self) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return NULL; - - // Execute - CefString _retval = CefWebPluginInfoCppToC::Get(self)->GetDescription(); - - // Return type: string - return _retval.DetachToUserFree(); -} - -} // namespace - -// CONSTRUCTOR - Do not edit by hand. - -CefWebPluginInfoCppToC::CefWebPluginInfoCppToC() { - GetStruct()->get_name = web_plugin_info_get_name; - GetStruct()->get_path = web_plugin_info_get_path; - GetStruct()->get_version = web_plugin_info_get_version; - GetStruct()->get_description = web_plugin_info_get_description; -} - -// DESTRUCTOR - Do not edit by hand. - -CefWebPluginInfoCppToC::~CefWebPluginInfoCppToC() { - shutdown_checker::AssertNotShutdown(); -} - -template <> -CefRefPtr CefCppToCRefCounted< - CefWebPluginInfoCppToC, - CefWebPluginInfo, - cef_web_plugin_info_t>::UnwrapDerived(CefWrapperType type, - cef_web_plugin_info_t* s) { - NOTREACHED() << "Unexpected class type: " << type; - return nullptr; -} - -template <> -CefWrapperType CefCppToCRefCounted::kWrapperType = - WT_WEB_PLUGIN_INFO; diff --git a/libcef_dll/cpptoc/web_plugin_info_cpptoc.h b/libcef_dll/cpptoc/web_plugin_info_cpptoc.h deleted file mode 100644 index 54ac02fb6..000000000 --- a/libcef_dll/cpptoc/web_plugin_info_cpptoc.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=6b84c31a12d45d8707befeb476e6977f59c3e6e2$ -// - -#ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_CPPTOC_H_ -#define CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_CPPTOC_H_ -#pragma once - -#if !defined(BUILDING_CEF_SHARED) -#error This file can be included DLL-side only -#endif - -#include "include/capi/cef_browser_capi.h" -#include "include/capi/cef_web_plugin_capi.h" -#include "include/cef_browser.h" -#include "include/cef_web_plugin.h" -#include "libcef_dll/cpptoc/cpptoc_ref_counted.h" - -// Wrap a C++ class with a C structure. -// This class may be instantiated and accessed DLL-side only. -class CefWebPluginInfoCppToC - : public CefCppToCRefCounted { - public: - CefWebPluginInfoCppToC(); - virtual ~CefWebPluginInfoCppToC(); -}; - -#endif // CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc b/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc deleted file mode 100644 index 2e59fce42..000000000 --- a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=df08a3fe475bba8107cfc45af61a31c4d0295014$ -// - -#include "libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h" -#include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h" -#include "libcef_dll/shutdown_checker.h" - -namespace { - -// MEMBER FUNCTIONS - Body may be edited by hand. - -int CEF_CALLBACK -web_plugin_info_visitor_visit(struct _cef_web_plugin_info_visitor_t* self, - cef_web_plugin_info_t* info, - int count, - int total) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return 0; - // Verify param: info; type: refptr_diff - DCHECK(info); - if (!info) - return 0; - - // Execute - bool _retval = CefWebPluginInfoVisitorCppToC::Get(self)->Visit( - CefWebPluginInfoCToCpp::Wrap(info), count, total); - - // Return type: bool - return _retval; -} - -} // namespace - -// CONSTRUCTOR - Do not edit by hand. - -CefWebPluginInfoVisitorCppToC::CefWebPluginInfoVisitorCppToC() { - GetStruct()->visit = web_plugin_info_visitor_visit; -} - -// DESTRUCTOR - Do not edit by hand. - -CefWebPluginInfoVisitorCppToC::~CefWebPluginInfoVisitorCppToC() { - shutdown_checker::AssertNotShutdown(); -} - -template <> -CefRefPtr CefCppToCRefCounted< - CefWebPluginInfoVisitorCppToC, - CefWebPluginInfoVisitor, - cef_web_plugin_info_visitor_t>::UnwrapDerived(CefWrapperType type, - cef_web_plugin_info_visitor_t* - s) { - NOTREACHED() << "Unexpected class type: " << type; - return nullptr; -} - -template <> -CefWrapperType - CefCppToCRefCounted::kWrapperType = - WT_WEB_PLUGIN_INFO_VISITOR; diff --git a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h b/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h deleted file mode 100644 index 283d37195..000000000 --- a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=5d5192e483c62143bf6b16ee292fe5e5f471e198$ -// - -#ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_VISITOR_CPPTOC_H_ -#define CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_VISITOR_CPPTOC_H_ -#pragma once - -#if !defined(WRAPPING_CEF_SHARED) -#error This file can be included wrapper-side only -#endif - -#include "include/capi/cef_browser_capi.h" -#include "include/capi/cef_web_plugin_capi.h" -#include "include/cef_browser.h" -#include "include/cef_web_plugin.h" -#include "libcef_dll/cpptoc/cpptoc_ref_counted.h" - -// Wrap a C++ class with a C structure. -// This class may be instantiated and accessed wrapper-side only. -class CefWebPluginInfoVisitorCppToC - : public CefCppToCRefCounted { - public: - CefWebPluginInfoVisitorCppToC(); - virtual ~CefWebPluginInfoVisitorCppToC(); -}; - -#endif // CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc b/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc deleted file mode 100644 index 50cab6cb8..000000000 --- a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=42ed9f3aa6aef7580eabb0a94981f1b7b5760d16$ -// - -#include "libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h" -#include "libcef_dll/shutdown_checker.h" - -namespace { - -// MEMBER FUNCTIONS - Body may be edited by hand. - -void CEF_CALLBACK web_plugin_unstable_callback_is_unstable( - struct _cef_web_plugin_unstable_callback_t* self, - const cef_string_t* path, - int unstable) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return; - // Verify param: path; type: string_byref_const - DCHECK(path); - if (!path) - return; - - // Execute - CefWebPluginUnstableCallbackCppToC::Get(self)->IsUnstable( - CefString(path), unstable ? true : false); -} - -} // namespace - -// CONSTRUCTOR - Do not edit by hand. - -CefWebPluginUnstableCallbackCppToC::CefWebPluginUnstableCallbackCppToC() { - GetStruct()->is_unstable = web_plugin_unstable_callback_is_unstable; -} - -// DESTRUCTOR - Do not edit by hand. - -CefWebPluginUnstableCallbackCppToC::~CefWebPluginUnstableCallbackCppToC() { - shutdown_checker::AssertNotShutdown(); -} - -template <> -CefRefPtr -CefCppToCRefCounted:: - UnwrapDerived(CefWrapperType type, cef_web_plugin_unstable_callback_t* s) { - NOTREACHED() << "Unexpected class type: " << type; - return nullptr; -} - -template <> -CefWrapperType - CefCppToCRefCounted::kWrapperType = - WT_WEB_PLUGIN_UNSTABLE_CALLBACK; diff --git a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h b/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h deleted file mode 100644 index 4d8c795c8..000000000 --- a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=35a890b3dfa88746ee48ed0c94f351098213d163$ -// - -#ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_UNSTABLE_CALLBACK_CPPTOC_H_ -#define CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_UNSTABLE_CALLBACK_CPPTOC_H_ -#pragma once - -#if !defined(WRAPPING_CEF_SHARED) -#error This file can be included wrapper-side only -#endif - -#include "include/capi/cef_browser_capi.h" -#include "include/capi/cef_web_plugin_capi.h" -#include "include/cef_browser.h" -#include "include/cef_web_plugin.h" -#include "libcef_dll/cpptoc/cpptoc_ref_counted.h" - -// Wrap a C++ class with a C structure. -// This class may be instantiated and accessed wrapper-side only. -class CefWebPluginUnstableCallbackCppToC - : public CefCppToCRefCounted { - public: - CefWebPluginUnstableCallbackCppToC(); - virtual ~CefWebPluginUnstableCallbackCppToC(); -}; - -#endif // CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_UNSTABLE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.cc b/libcef_dll/ctocpp/request_handler_ctocpp.cc index 6bdd40a64..0e173832a 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_handler_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=be460a1bbdf46dd4e317b39981878b3993675884$ +// $hash=8a0ae45a7340b21491e67f4b4bd5494fb6c14d8c$ // #include "libcef_dll/ctocpp/request_handler_ctocpp.h" @@ -327,31 +327,6 @@ bool CefRequestHandlerCToCpp::OnSelectClientCertificate( return _retval ? true : false; } -NO_SANITIZE("cfi-icall") -void CefRequestHandlerCToCpp::OnPluginCrashed(CefRefPtr browser, - const CefString& plugin_path) { - shutdown_checker::AssertNotShutdown(); - - cef_request_handler_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, on_plugin_crashed)) - return; - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: browser; type: refptr_diff - DCHECK(browser.get()); - if (!browser.get()) - return; - // Verify param: plugin_path; type: string_byref_const - DCHECK(!plugin_path.empty()); - if (plugin_path.empty()) - return; - - // Execute - _struct->on_plugin_crashed(_struct, CefBrowserCppToC::Wrap(browser), - plugin_path.GetStruct()); -} - NO_SANITIZE("cfi-icall") void CefRequestHandlerCToCpp::OnRenderViewReady(CefRefPtr browser) { shutdown_checker::AssertNotShutdown(); diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.h b/libcef_dll/ctocpp/request_handler_ctocpp.h index b6b473456..2b3023a1e 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.h +++ b/libcef_dll/ctocpp/request_handler_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2db5977714e59976ae9617a49a65cadb72623ebd$ +// $hash=196e93e7eb44712449c6cb3796fdf8805102eca5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_HANDLER_CTOCPP_H_ @@ -77,8 +77,6 @@ class CefRequestHandlerCToCpp int port, const X509CertificateList& certificates, CefRefPtr callback) override; - void OnPluginCrashed(CefRefPtr browser, - const CefString& plugin_path) override; void OnRenderViewReady(CefRefPtr browser) override; void OnRenderProcessTerminated(CefRefPtr browser, TerminationStatus status) override; diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc b/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc deleted file mode 100644 index 6638dba62..000000000 --- a/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=9d4817b23d989f8ebda6d7be594bca00fe84c3a6$ -// - -#include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h" -#include "libcef_dll/shutdown_checker.h" - -// VIRTUAL METHODS - Body may be edited by hand. - -NO_SANITIZE("cfi-icall") CefString CefWebPluginInfoCToCpp::GetName() { - shutdown_checker::AssertNotShutdown(); - - cef_web_plugin_info_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_name)) - return CefString(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - cef_string_userfree_t _retval = _struct->get_name(_struct); - - // Return type: string - CefString _retvalStr; - _retvalStr.AttachToUserFree(_retval); - return _retvalStr; -} - -NO_SANITIZE("cfi-icall") CefString CefWebPluginInfoCToCpp::GetPath() { - shutdown_checker::AssertNotShutdown(); - - cef_web_plugin_info_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_path)) - return CefString(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - cef_string_userfree_t _retval = _struct->get_path(_struct); - - // Return type: string - CefString _retvalStr; - _retvalStr.AttachToUserFree(_retval); - return _retvalStr; -} - -NO_SANITIZE("cfi-icall") CefString CefWebPluginInfoCToCpp::GetVersion() { - shutdown_checker::AssertNotShutdown(); - - cef_web_plugin_info_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_version)) - return CefString(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - cef_string_userfree_t _retval = _struct->get_version(_struct); - - // Return type: string - CefString _retvalStr; - _retvalStr.AttachToUserFree(_retval); - return _retvalStr; -} - -NO_SANITIZE("cfi-icall") CefString CefWebPluginInfoCToCpp::GetDescription() { - shutdown_checker::AssertNotShutdown(); - - cef_web_plugin_info_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_description)) - return CefString(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - cef_string_userfree_t _retval = _struct->get_description(_struct); - - // Return type: string - CefString _retvalStr; - _retvalStr.AttachToUserFree(_retval); - return _retvalStr; -} - -// CONSTRUCTOR - Do not edit by hand. - -CefWebPluginInfoCToCpp::CefWebPluginInfoCToCpp() {} - -// DESTRUCTOR - Do not edit by hand. - -CefWebPluginInfoCToCpp::~CefWebPluginInfoCToCpp() { - shutdown_checker::AssertNotShutdown(); -} - -template <> -cef_web_plugin_info_t* -CefCToCppRefCounted::UnwrapDerived(CefWrapperType type, - CefWebPluginInfo* c) { - NOTREACHED() << "Unexpected class type: " << type; - return nullptr; -} - -template <> -CefWrapperType CefCToCppRefCounted::kWrapperType = - WT_WEB_PLUGIN_INFO; diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h b/libcef_dll/ctocpp/web_plugin_info_ctocpp.h deleted file mode 100644 index 892f1c56f..000000000 --- a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=2badf953109b36ba6644788e2b77677121a806ba$ -// - -#ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ -#define CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ -#pragma once - -#if !defined(WRAPPING_CEF_SHARED) -#error This file can be included wrapper-side only -#endif - -#include "include/capi/cef_browser_capi.h" -#include "include/capi/cef_web_plugin_capi.h" -#include "include/cef_browser.h" -#include "include/cef_web_plugin.h" -#include "libcef_dll/ctocpp/ctocpp_ref_counted.h" - -// Wrap a C structure with a C++ class. -// This class may be instantiated and accessed wrapper-side only. -class CefWebPluginInfoCToCpp - : public CefCToCppRefCounted { - public: - CefWebPluginInfoCToCpp(); - virtual ~CefWebPluginInfoCToCpp(); - - // CefWebPluginInfo methods. - CefString GetName() override; - CefString GetPath() override; - CefString GetVersion() override; - CefString GetDescription() override; -}; - -#endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc b/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc deleted file mode 100644 index 50615c237..000000000 --- a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=387ecb28b55d3ece3eb4fcf0e119918fd5e36fd7$ -// - -#include "libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h" -#include "libcef_dll/cpptoc/web_plugin_info_cpptoc.h" -#include "libcef_dll/shutdown_checker.h" - -// VIRTUAL METHODS - Body may be edited by hand. - -NO_SANITIZE("cfi-icall") -bool CefWebPluginInfoVisitorCToCpp::Visit(CefRefPtr info, - int count, - int total) { - shutdown_checker::AssertNotShutdown(); - - cef_web_plugin_info_visitor_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, visit)) - return false; - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: info; type: refptr_diff - DCHECK(info.get()); - if (!info.get()) - return false; - - // Execute - int _retval = - _struct->visit(_struct, CefWebPluginInfoCppToC::Wrap(info), count, total); - - // Return type: bool - return _retval ? true : false; -} - -// CONSTRUCTOR - Do not edit by hand. - -CefWebPluginInfoVisitorCToCpp::CefWebPluginInfoVisitorCToCpp() {} - -// DESTRUCTOR - Do not edit by hand. - -CefWebPluginInfoVisitorCToCpp::~CefWebPluginInfoVisitorCToCpp() { - shutdown_checker::AssertNotShutdown(); -} - -template <> -cef_web_plugin_info_visitor_t* CefCToCppRefCounted< - CefWebPluginInfoVisitorCToCpp, - CefWebPluginInfoVisitor, - cef_web_plugin_info_visitor_t>::UnwrapDerived(CefWrapperType type, - CefWebPluginInfoVisitor* c) { - NOTREACHED() << "Unexpected class type: " << type; - return nullptr; -} - -template <> -CefWrapperType - CefCToCppRefCounted::kWrapperType = - WT_WEB_PLUGIN_INFO_VISITOR; diff --git a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h b/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h deleted file mode 100644 index b2dbc50fa..000000000 --- a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=eb32b50c8f9ec072541fe4effffd00159f99ad0b$ -// - -#ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_VISITOR_CTOCPP_H_ -#define CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_VISITOR_CTOCPP_H_ -#pragma once - -#if !defined(BUILDING_CEF_SHARED) -#error This file can be included DLL-side only -#endif - -#include "include/capi/cef_browser_capi.h" -#include "include/capi/cef_web_plugin_capi.h" -#include "include/cef_browser.h" -#include "include/cef_web_plugin.h" -#include "libcef_dll/ctocpp/ctocpp_ref_counted.h" - -// Wrap a C structure with a C++ class. -// This class may be instantiated and accessed DLL-side only. -class CefWebPluginInfoVisitorCToCpp - : public CefCToCppRefCounted { - public: - CefWebPluginInfoVisitorCToCpp(); - virtual ~CefWebPluginInfoVisitorCToCpp(); - - // CefWebPluginInfoVisitor methods. - bool Visit(CefRefPtr info, int count, int total) override; -}; - -#endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc b/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc deleted file mode 100644 index eafe8956d..000000000 --- a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=feef390ffa570224c4ff5ef11ecce9cb87b32f65$ -// - -#include "libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h" -#include "libcef_dll/shutdown_checker.h" - -// VIRTUAL METHODS - Body may be edited by hand. - -NO_SANITIZE("cfi-icall") -void CefWebPluginUnstableCallbackCToCpp::IsUnstable(const CefString& path, - bool unstable) { - shutdown_checker::AssertNotShutdown(); - - cef_web_plugin_unstable_callback_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, is_unstable)) - return; - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(!path.empty()); - if (path.empty()) - return; - - // Execute - _struct->is_unstable(_struct, path.GetStruct(), unstable); -} - -// CONSTRUCTOR - Do not edit by hand. - -CefWebPluginUnstableCallbackCToCpp::CefWebPluginUnstableCallbackCToCpp() {} - -// DESTRUCTOR - Do not edit by hand. - -CefWebPluginUnstableCallbackCToCpp::~CefWebPluginUnstableCallbackCToCpp() { - shutdown_checker::AssertNotShutdown(); -} - -template <> -cef_web_plugin_unstable_callback_t* -CefCToCppRefCounted:: - UnwrapDerived(CefWrapperType type, CefWebPluginUnstableCallback* c) { - NOTREACHED() << "Unexpected class type: " << type; - return nullptr; -} - -template <> -CefWrapperType - CefCToCppRefCounted::kWrapperType = - WT_WEB_PLUGIN_UNSTABLE_CALLBACK; diff --git a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h b/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h deleted file mode 100644 index 004acc20e..000000000 --- a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// -// $hash=b3c9d90a4db5994aa5283611044dceffc5ef2baa$ -// - -#ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_UNSTABLE_CALLBACK_CTOCPP_H_ -#define CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_UNSTABLE_CALLBACK_CTOCPP_H_ -#pragma once - -#if !defined(BUILDING_CEF_SHARED) -#error This file can be included DLL-side only -#endif - -#include "include/capi/cef_browser_capi.h" -#include "include/capi/cef_web_plugin_capi.h" -#include "include/cef_browser.h" -#include "include/cef_web_plugin.h" -#include "libcef_dll/ctocpp/ctocpp_ref_counted.h" - -// Wrap a C structure with a C++ class. -// This class may be instantiated and accessed DLL-side only. -class CefWebPluginUnstableCallbackCToCpp - : public CefCToCppRefCounted { - public: - CefWebPluginUnstableCallbackCToCpp(); - virtual ~CefWebPluginUnstableCallbackCToCpp(); - - // CefWebPluginUnstableCallback methods. - void IsUnstable(const CefString& path, bool unstable) override; -}; - -#endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_UNSTABLE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/libcef_dll.cc b/libcef_dll/libcef_dll.cc index 8751dccc7..5635032f5 100644 --- a/libcef_dll/libcef_dll.cc +++ b/libcef_dll/libcef_dll.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=66488e9aeed47b626c786d18e6e33a6d24cfef2c$ +// $hash=3ec7e1f78d91004790dda03a97832aa37c33d0f9$ // #include "include/capi/cef_app_capi.h" @@ -25,7 +25,6 @@ #include "include/capi/cef_task_capi.h" #include "include/capi/cef_trace_capi.h" #include "include/capi/cef_v8_capi.h" -#include "include/capi/cef_web_plugin_capi.h" #include "include/capi/test/cef_test_helpers_capi.h" #include "include/cef_app.h" #include "include/cef_crash_util.h" @@ -40,7 +39,6 @@ #include "include/cef_task.h" #include "include/cef_trace.h" #include "include/cef_v8.h" -#include "include/cef_web_plugin.h" #include "include/test/cef_test_helpers.h" #include "libcef_dll/cpptoc/binary_value_cpptoc.h" #include "libcef_dll/cpptoc/command_line_cpptoc.h" @@ -52,8 +50,6 @@ #include "libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h" #include "libcef_dll/ctocpp/task_ctocpp.h" #include "libcef_dll/ctocpp/v8handler_ctocpp.h" -#include "libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h" -#include "libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h" #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/template_util.h" #include "libcef_dll/transfer_util.h" @@ -861,69 +857,6 @@ CEF_EXPORT int cef_register_extension(const cef_string_t* extension_name, return _retval; } -CEF_EXPORT void cef_visit_web_plugin_info( - struct _cef_web_plugin_info_visitor_t* visitor) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: visitor; type: refptr_diff - DCHECK(visitor); - if (!visitor) - return; - - // Execute - CefVisitWebPluginInfo(CefWebPluginInfoVisitorCToCpp::Wrap(visitor)); -} - -CEF_EXPORT void cef_refresh_web_plugins() { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - CefRefreshWebPlugins(); -} - -CEF_EXPORT void cef_unregister_internal_web_plugin(const cef_string_t* path) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(path); - if (!path) - return; - - // Execute - CefUnregisterInternalWebPlugin(CefString(path)); -} - -CEF_EXPORT void cef_register_web_plugin_crash(const cef_string_t* path) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(path); - if (!path) - return; - - // Execute - CefRegisterWebPluginCrash(CefString(path)); -} - -CEF_EXPORT void cef_is_web_plugin_unstable( - const cef_string_t* path, - struct _cef_web_plugin_unstable_callback_t* callback) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(path); - if (!path) - return; - // Verify param: callback; type: refptr_diff - DCHECK(callback); - if (!callback) - return; - - // Execute - CefIsWebPluginUnstable(CefString(path), - CefWebPluginUnstableCallbackCToCpp::Wrap(callback)); -} - CEF_EXPORT void cef_execute_java_script_with_user_gesture_for_tests( struct _cef_frame_t* frame, const cef_string_t* javascript) { diff --git a/libcef_dll/wrapper/libcef_dll_dylib.cc b/libcef_dll/wrapper/libcef_dll_dylib.cc index 30a468d52..f42fbf0ed 100644 --- a/libcef_dll/wrapper/libcef_dll_dylib.cc +++ b/libcef_dll/wrapper/libcef_dll_dylib.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ac1c94b2e83a4c806bed11fd0f456f8fe7ff1c44$ +// $hash=5bf495a6015a7c0937225685bfbe8e0163e67583$ // #include @@ -48,7 +48,6 @@ #include "include/capi/cef_v8_capi.h" #include "include/capi/cef_values_capi.h" #include "include/capi/cef_waitable_event_capi.h" -#include "include/capi/cef_web_plugin_capi.h" #include "include/capi/cef_xml_reader_capi.h" #include "include/capi/cef_zip_reader_capi.h" #include "include/capi/test/cef_test_helpers_capi.h" @@ -171,14 +170,6 @@ typedef int64 (*cef_now_from_system_trace_time_ptr)(); typedef int (*cef_register_extension_ptr)(const cef_string_t*, const cef_string_t*, struct _cef_v8handler_t*); -typedef void (*cef_visit_web_plugin_info_ptr)( - struct _cef_web_plugin_info_visitor_t*); -typedef void (*cef_refresh_web_plugins_ptr)(); -typedef void (*cef_unregister_internal_web_plugin_ptr)(const cef_string_t*); -typedef void (*cef_register_web_plugin_crash_ptr)(const cef_string_t*); -typedef void (*cef_is_web_plugin_unstable_ptr)( - const cef_string_t*, - struct _cef_web_plugin_unstable_callback_t*); typedef void (*cef_execute_java_script_with_user_gesture_for_tests_ptr)( struct _cef_frame_t*, const cef_string_t*); @@ -565,11 +556,6 @@ struct libcef_pointers { cef_end_tracing_ptr cef_end_tracing; cef_now_from_system_trace_time_ptr cef_now_from_system_trace_time; cef_register_extension_ptr cef_register_extension; - cef_visit_web_plugin_info_ptr cef_visit_web_plugin_info; - cef_refresh_web_plugins_ptr cef_refresh_web_plugins; - cef_unregister_internal_web_plugin_ptr cef_unregister_internal_web_plugin; - cef_register_web_plugin_crash_ptr cef_register_web_plugin_crash; - cef_is_web_plugin_unstable_ptr cef_is_web_plugin_unstable; cef_execute_java_script_with_user_gesture_for_tests_ptr cef_execute_java_script_with_user_gesture_for_tests; cef_browser_host_create_browser_ptr cef_browser_host_create_browser; @@ -782,11 +768,6 @@ int libcef_init_pointers(const char* path) { INIT_ENTRY(cef_end_tracing); INIT_ENTRY(cef_now_from_system_trace_time); INIT_ENTRY(cef_register_extension); - INIT_ENTRY(cef_visit_web_plugin_info); - INIT_ENTRY(cef_refresh_web_plugins); - INIT_ENTRY(cef_unregister_internal_web_plugin); - INIT_ENTRY(cef_register_web_plugin_crash); - INIT_ENTRY(cef_is_web_plugin_unstable); INIT_ENTRY(cef_execute_java_script_with_user_gesture_for_tests); INIT_ENTRY(cef_browser_host_create_browser); INIT_ENTRY(cef_browser_host_create_browser_sync); @@ -1232,32 +1213,6 @@ int cef_register_extension(const cef_string_t* extension_name, javascript_code, handler); } -NO_SANITIZE("cfi-icall") -void cef_visit_web_plugin_info(struct _cef_web_plugin_info_visitor_t* visitor) { - g_libcef_pointers.cef_visit_web_plugin_info(visitor); -} - -NO_SANITIZE("cfi-icall") void cef_refresh_web_plugins() { - g_libcef_pointers.cef_refresh_web_plugins(); -} - -NO_SANITIZE("cfi-icall") -void cef_unregister_internal_web_plugin(const cef_string_t* path) { - g_libcef_pointers.cef_unregister_internal_web_plugin(path); -} - -NO_SANITIZE("cfi-icall") -void cef_register_web_plugin_crash(const cef_string_t* path) { - g_libcef_pointers.cef_register_web_plugin_crash(path); -} - -NO_SANITIZE("cfi-icall") -void cef_is_web_plugin_unstable( - const cef_string_t* path, - struct _cef_web_plugin_unstable_callback_t* callback) { - g_libcef_pointers.cef_is_web_plugin_unstable(path, callback); -} - NO_SANITIZE("cfi-icall") void cef_execute_java_script_with_user_gesture_for_tests( struct _cef_frame_t* frame, diff --git a/libcef_dll/wrapper/libcef_dll_wrapper.cc b/libcef_dll/wrapper/libcef_dll_wrapper.cc index e406eb760..38eec0c0e 100644 --- a/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=180ca5b8f789625a725e004aa6768fd5046a3753$ +// $hash=b0db26b4749beed24b02af98543422f489e0a0a8$ // #include "include/capi/cef_app_capi.h" @@ -25,7 +25,6 @@ #include "include/capi/cef_task_capi.h" #include "include/capi/cef_trace_capi.h" #include "include/capi/cef_v8_capi.h" -#include "include/capi/cef_web_plugin_capi.h" #include "include/capi/test/cef_test_helpers_capi.h" #include "include/cef_api_hash.h" #include "include/cef_app.h" @@ -41,7 +40,6 @@ #include "include/cef_task.h" #include "include/cef_trace.h" #include "include/cef_v8.h" -#include "include/cef_web_plugin.h" #include "include/test/cef_test_helpers.h" #include "libcef_dll/cpptoc/app_cpptoc.h" #include "libcef_dll/cpptoc/completion_callback_cpptoc.h" @@ -49,8 +47,6 @@ #include "libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h" #include "libcef_dll/cpptoc/task_cpptoc.h" #include "libcef_dll/cpptoc/v8handler_cpptoc.h" -#include "libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h" -#include "libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h" #include "libcef_dll/ctocpp/binary_value_ctocpp.h" #include "libcef_dll/ctocpp/command_line_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" @@ -806,73 +802,6 @@ CEF_GLOBAL bool CefRegisterExtension(const CefString& extension_name, return _retval ? true : false; } -NO_SANITIZE("cfi-icall") -CEF_GLOBAL -void CefVisitWebPluginInfo(CefRefPtr visitor) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: visitor; type: refptr_diff - DCHECK(visitor.get()); - if (!visitor.get()) - return; - - // Execute - cef_visit_web_plugin_info(CefWebPluginInfoVisitorCppToC::Wrap(visitor)); -} - -NO_SANITIZE("cfi-icall") CEF_GLOBAL void CefRefreshWebPlugins() { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - cef_refresh_web_plugins(); -} - -NO_SANITIZE("cfi-icall") -CEF_GLOBAL void CefUnregisterInternalWebPlugin(const CefString& path) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(!path.empty()); - if (path.empty()) - return; - - // Execute - cef_unregister_internal_web_plugin(path.GetStruct()); -} - -NO_SANITIZE("cfi-icall") -CEF_GLOBAL void CefRegisterWebPluginCrash(const CefString& path) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(!path.empty()); - if (path.empty()) - return; - - // Execute - cef_register_web_plugin_crash(path.GetStruct()); -} - -NO_SANITIZE("cfi-icall") -CEF_GLOBAL void CefIsWebPluginUnstable( - const CefString& path, - CefRefPtr callback) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: path; type: string_byref_const - DCHECK(!path.empty()); - if (path.empty()) - return; - // Verify param: callback; type: refptr_diff - DCHECK(callback.get()); - if (!callback.get()) - return; - - // Execute - cef_is_web_plugin_unstable( - path.GetStruct(), CefWebPluginUnstableCallbackCppToC::Wrap(callback)); -} - NO_SANITIZE("cfi-icall") CEF_GLOBAL void CefExecuteJavaScriptWithUserGestureForTests( CefRefPtr frame, diff --git a/libcef_dll/wrapper_types.h b/libcef_dll/wrapper_types.h index 7edafac57..c28d05a5e 100644 --- a/libcef_dll/wrapper_types.h +++ b/libcef_dll/wrapper_types.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec2815ca7044a7ee3ba7f0afcb293a31da5a9feb$ +// $hash=4e961a86c94ee512e3c282c0b620e35992bf862b$ // #ifndef CEF_LIBCEF_DLL_WRAPPER_TYPES_H_ @@ -163,9 +163,6 @@ enum CefWrapperType { WT_VIEW, WT_VIEW_DELEGATE, WT_WAITABLE_EVENT, - WT_WEB_PLUGIN_INFO, - WT_WEB_PLUGIN_INFO_VISITOR, - WT_WEB_PLUGIN_UNSTABLE_CALLBACK, WT_WINDOW, WT_WINDOW_DELEGATE, WT_WRITE_HANDLER, diff --git a/tests/cefclient/browser/osr_window_win.cc b/tests/cefclient/browser/osr_window_win.cc index 28d573606..ad3da12fc 100644 --- a/tests/cefclient/browser/osr_window_win.cc +++ b/tests/cefclient/browser/osr_window_win.cc @@ -1036,7 +1036,7 @@ void OsrWindowWin::OnCursorChange(CefRefPtr browser, if (!::IsWindow(hwnd_)) return; - // Change the plugin window's cursor. + // Change the window's cursor. SetClassLongPtr(hwnd_, GCLP_HCURSOR, static_cast(reinterpret_cast(cursor))); SetCursor(cursor); diff --git a/tests/cefclient/browser/resource.h b/tests/cefclient/browser/resource.h index 4ab3465b8..584c21bca 100644 --- a/tests/cefclient/browser/resource.h +++ b/tests/cefclient/browser/resource.h @@ -27,22 +27,21 @@ #define ID_TESTS_GETSOURCE 32700 #define ID_TESTS_GETTEXT 32701 #define ID_TESTS_OTHER_TESTS 32702 -#define ID_TESTS_PLUGIN_INFO 32703 -#define ID_TESTS_WINDOW_NEW 32704 -#define ID_TESTS_WINDOW_POPUP 32705 -#define ID_TESTS_PRINT 32706 -#define ID_TESTS_REQUEST 32707 -#define ID_TESTS_TRACING_BEGIN 32708 -#define ID_TESTS_TRACING_END 32709 -#define ID_TESTS_ZOOM_IN 32710 -#define ID_TESTS_ZOOM_OUT 32711 -#define ID_TESTS_ZOOM_RESET 32712 -#define ID_TESTS_OSR_FPS 32713 -#define ID_TESTS_OSR_DSF 32714 -#define ID_TESTS_PRINT_TO_PDF 32715 -#define ID_TESTS_MUTE_AUDIO 32716 -#define ID_TESTS_UNMUTE_AUDIO 32717 -#define ID_TESTS_LAST 32717 +#define ID_TESTS_WINDOW_NEW 32703 +#define ID_TESTS_WINDOW_POPUP 32704 +#define ID_TESTS_PRINT 32705 +#define ID_TESTS_REQUEST 32706 +#define ID_TESTS_TRACING_BEGIN 32707 +#define ID_TESTS_TRACING_END 32708 +#define ID_TESTS_ZOOM_IN 32709 +#define ID_TESTS_ZOOM_OUT 32710 +#define ID_TESTS_ZOOM_RESET 32711 +#define ID_TESTS_OSR_FPS 32712 +#define ID_TESTS_OSR_DSF 32713 +#define ID_TESTS_PRINT_TO_PDF 32714 +#define ID_TESTS_MUTE_AUDIO 32715 +#define ID_TESTS_UNMUTE_AUDIO 32716 +#define ID_TESTS_LAST 32716 #define IDC_STATIC -1 #define IDS_BINDING_HTML 1000 #define IDS_DIALOGS_HTML 1001 diff --git a/tests/cefclient/browser/root_window_gtk.cc b/tests/cefclient/browser/root_window_gtk.cc index 20ae683fc..186126c82 100644 --- a/tests/cefclient/browser/root_window_gtk.cc +++ b/tests/cefclient/browser/root_window_gtk.cc @@ -914,7 +914,6 @@ GtkWidget* RootWindowGtk::CreateMenuBar() { AddMenuEntry(test_menu, "New Window", ID_TESTS_WINDOW_NEW); AddMenuEntry(test_menu, "Popup Window", ID_TESTS_WINDOW_POPUP); AddMenuEntry(test_menu, "Request", ID_TESTS_REQUEST); - AddMenuEntry(test_menu, "Plugin Info", ID_TESTS_PLUGIN_INFO); AddMenuEntry(test_menu, "Zoom In", ID_TESTS_ZOOM_IN); AddMenuEntry(test_menu, "Zoom Out", ID_TESTS_ZOOM_OUT); AddMenuEntry(test_menu, "Zoom Reset", ID_TESTS_ZOOM_RESET); diff --git a/tests/cefclient/browser/test_runner.cc b/tests/cefclient/browser/test_runner.cc index 6932e37d7..304007e35 100644 --- a/tests/cefclient/browser/test_runner.cc +++ b/tests/cefclient/browser/test_runner.cc @@ -13,7 +13,6 @@ #include "include/cef_parser.h" #include "include/cef_task.h" #include "include/cef_trace.h" -#include "include/cef_web_plugin.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" #include "tests/cefclient/browser/binding_test.h" @@ -43,7 +42,6 @@ const char kTestOrigin[] = "http://tests/"; // Pages handled via StringResourceProvider. const char kTestGetSourcePage[] = "get_source.html"; const char kTestGetTextPage[] = "get_text.html"; -const char kTestPluginInfoPage[] = "plugin_info.html"; // Set page data and navigate the browser. Used in combination with // StringResourceProvider. @@ -164,41 +162,6 @@ void RunPopupWindowTest(CefRefPtr browser) { "window.open('http://www.google.com');", "about:blank", 0); } -void RunPluginInfoTest(CefRefPtr browser) { - class Visitor : public CefWebPluginInfoVisitor { - public: - explicit Visitor(CefRefPtr browser) : browser_(browser) { - html_ = - "Plugin Info Test" - "" - "\nInstalled plugins:"; - } - ~Visitor() { - html_ += "\n"; - - // Load the html in the browser. - LoadStringResourcePage(browser_, kTestPluginInfoPage, html_); - } - - virtual bool Visit(CefRefPtr info, - int count, - int total) override { - html_ += "\n

Name: " + info->GetName().ToString() + - "\n
Description: " + info->GetDescription().ToString() + - "\n
Version: " + info->GetVersion().ToString() + - "\n
Path: " + info->GetPath().ToString(); - return true; - } - - private: - std::string html_; - CefRefPtr browser_; - IMPLEMENT_REFCOUNTING(Visitor); - }; - - CefVisitWebPluginInfo(new Visitor(browser)); -} - void ModifyZoom(CefRefPtr browser, double delta) { if (!CefCurrentlyOn(TID_UI)) { // Execute on the UI thread. @@ -594,9 +557,6 @@ void RunTest(CefRefPtr browser, int id) { case ID_TESTS_REQUEST: RunRequestTest(browser); break; - case ID_TESTS_PLUGIN_INFO: - RunPluginInfoTest(browser); - break; case ID_TESTS_ZOOM_IN: ModifyZoom(browser, 0.5); break; @@ -819,7 +779,6 @@ void SetupResourceManager(CefRefPtr resource_manager, std::set string_pages; string_pages.insert(kTestGetSourcePage); string_pages.insert(kTestGetTextPage); - string_pages.insert(kTestPluginInfoPage); // Add provider for string resources. resource_manager->AddProvider( diff --git a/tests/cefclient/browser/views_window.cc b/tests/cefclient/browser/views_window.cc index 49a72ba24..061fec16d 100644 --- a/tests/cefclient/browser/views_window.cc +++ b/tests/cefclient/browser/views_window.cc @@ -80,7 +80,6 @@ void AddTestMenuItems(CefRefPtr test_menu) { test_menu->AddItem(ID_TESTS_WINDOW_NEW, "New Window"); test_menu->AddItem(ID_TESTS_WINDOW_POPUP, "Popup Window"); test_menu->AddItem(ID_TESTS_REQUEST, "Request"); - test_menu->AddItem(ID_TESTS_PLUGIN_INFO, "Plugin Info"); test_menu->AddItem(ID_TESTS_ZOOM_IN, "Zoom In"); test_menu->AddItem(ID_TESTS_ZOOM_OUT, "Zoom Out"); test_menu->AddItem(ID_TESTS_ZOOM_RESET, "Zoom Reset"); diff --git a/tests/cefclient/cefclient_mac.mm b/tests/cefclient/cefclient_mac.mm index eddb2dd1c..59e84dd78 100644 --- a/tests/cefclient/cefclient_mac.mm +++ b/tests/cefclient/cefclient_mac.mm @@ -55,7 +55,6 @@ NSMenuItem* GetMenuItemWithAction(NSMenu* menu, SEL action_selector) { - (IBAction)menuTestsWindowNew:(id)sender; - (IBAction)menuTestsWindowPopup:(id)sender; - (IBAction)menuTestsRequest:(id)sender; -- (IBAction)menuTestsPluginInfo:(id)sender; - (IBAction)menuTestsZoomIn:(id)sender; - (IBAction)menuTestsZoomOut:(id)sender; - (IBAction)menuTestsZoomReset:(id)sender; @@ -270,10 +269,6 @@ NSMenuItem* GetMenuItemWithAction(NSMenu* menu, SEL action_selector) { [self testsItemSelected:ID_TESTS_REQUEST]; } -- (IBAction)menuTestsPluginInfo:(id)sender { - [self testsItemSelected:ID_TESTS_PLUGIN_INFO]; -} - - (IBAction)menuTestsZoomIn:(id)sender { [self testsItemSelected:ID_TESTS_ZOOM_IN]; } diff --git a/tests/cefclient/resources/mac/English.lproj/MainMenu.xib b/tests/cefclient/resources/mac/English.lproj/MainMenu.xib index d54bff2cb..18109db36 100644 --- a/tests/cefclient/resources/mac/English.lproj/MainMenu.xib +++ b/tests/cefclient/resources/mac/English.lproj/MainMenu.xib @@ -357,12 +357,6 @@ - - - - - - diff --git a/tests/cefclient/resources/other_tests.html b/tests/cefclient/resources/other_tests.html index 0d2f8a784..9be314b7c 100644 --- a/tests/cefclient/resources/other_tests.html +++ b/tests/cefclient/resources/other_tests.html @@ -14,7 +14,6 @@
  • Drag & Drop
  • Draggable Regions
  • DRM (Clearkey, Widevine) Codecs support, Video player demo
    • -
  • Flash Plugin - requires "enable-system-flash" flag on Win/Mac and "ppapi-flash-path", "ppapi-flash-version" flags on Linux
  • HTML5 Feature Test
  • HTML5 Filesystem - requires "cache-path" flag
  • HTML5 Video
    • diff --git a/tests/cefclient/resources/win/cefclient.rc b/tests/cefclient/resources/win/cefclient.rc index c4b7aa94e..fdea98a07 100644 --- a/tests/cefclient/resources/win/cefclient.rc +++ b/tests/cefclient/resources/win/cefclient.rc @@ -93,7 +93,6 @@ BEGIN MENUITEM "New Window", ID_TESTS_WINDOW_NEW MENUITEM "Popup Window", ID_TESTS_WINDOW_POPUP MENUITEM "Request", ID_TESTS_REQUEST - MENUITEM "Plugin Info", ID_TESTS_PLUGIN_INFO MENUITEM "Zoom In", ID_TESTS_ZOOM_IN MENUITEM "Zoom Out", ID_TESTS_ZOOM_OUT MENUITEM "Zoom Reset", ID_TESTS_ZOOM_RESET diff --git a/tests/cefsimple/cefsimple_linux.cc b/tests/cefsimple/cefsimple_linux.cc index c394f4558..26b3c7b91 100644 --- a/tests/cefsimple/cefsimple_linux.cc +++ b/tests/cefsimple/cefsimple_linux.cc @@ -37,9 +37,9 @@ int main(int argc, char* argv[]) { // Provide CEF with command-line arguments. CefMainArgs main_args(argc, argv); - // CEF applications have multiple sub-processes (render, plugin, GPU, etc) - // that share the same executable. This function checks the command-line and, - // if this is a sub-process, executes the appropriate logic. + // CEF applications have multiple sub-processes (render, GPU, etc) that share + // the same executable. This function checks the command-line and, if this is + // a sub-process, executes the appropriate logic. int exit_code = CefExecuteProcess(main_args, nullptr, nullptr); if (exit_code >= 0) { // The sub-process has completed so return here. diff --git a/tests/cefsimple/cefsimple_win.cc b/tests/cefsimple/cefsimple_win.cc index 5420c3274..03b8f9e62 100644 --- a/tests/cefsimple/cefsimple_win.cc +++ b/tests/cefsimple/cefsimple_win.cc @@ -43,9 +43,9 @@ int APIENTRY wWinMain(HINSTANCE hInstance, // Provide CEF with command-line arguments. CefMainArgs main_args(hInstance); - // CEF applications have multiple sub-processes (render, plugin, GPU, etc) - // that share the same executable. This function checks the command-line and, - // if this is a sub-process, executes the appropriate logic. + // CEF applications have multiple sub-processes (render, GPU, etc) that share + // the same executable. This function checks the command-line and, if this is + // a sub-process, executes the appropriate logic. int exit_code = CefExecuteProcess(main_args, nullptr, sandbox_info); if (exit_code >= 0) { // The sub-process has completed so return here. diff --git a/tests/ceftests/client_app_delegates.cc b/tests/ceftests/client_app_delegates.cc index f62d8d2d6..b99f24153 100644 --- a/tests/ceftests/client_app_delegates.cc +++ b/tests/ceftests/client_app_delegates.cc @@ -13,15 +13,10 @@ void CreateBrowserDelegates(ClientAppBrowser::DelegateSet& delegates) { extern void CreateAudioOutputTests(ClientAppBrowser::DelegateSet & delegates); CreateAudioOutputTests(delegates); - // Bring in the plugin tests. + // Bring in the CORS tests. extern void CreateCorsBrowserTests(ClientAppBrowser::DelegateSet & delegates); CreateCorsBrowserTests(delegates); - // Bring in the PDF viewer tests. - extern void CreatePdfViewerBrowserTests(ClientAppBrowser::DelegateSet & - delegates); - CreatePdfViewerBrowserTests(delegates); - // Bring in the preference tests. extern void CreatePreferenceBrowserTests(ClientAppBrowser::DelegateSet & delegates); diff --git a/tests/ceftests/cors_unittest.cc b/tests/ceftests/cors_unittest.cc index 69ddb54ae..b4d3f2404 100644 --- a/tests/ceftests/cors_unittest.cc +++ b/tests/ceftests/cors_unittest.cc @@ -1787,7 +1787,7 @@ void SetupRedirectPostRequest(RedirectMode mode, CORS_TEST_REDIRECT_POST_ALL(302, MODE_302) CORS_TEST_REDIRECT_POST_ALL(307, MODE_307) -// Entry point for creating plugin browser test objects. +// Entry point for creating CORS browser test objects. // Called from client_app_delegates.cc. void CreateCorsBrowserTests(client::ClientAppBrowser::DelegateSet& delegates) { delegates.insert(new CorsBrowserTest); diff --git a/tests/ceftests/pdf_viewer_unittest.cc b/tests/ceftests/pdf_viewer_unittest.cc index afecfce35..486bb0957 100644 --- a/tests/ceftests/pdf_viewer_unittest.cc +++ b/tests/ceftests/pdf_viewer_unittest.cc @@ -15,22 +15,6 @@ namespace { -// Browser-side app delegate. -class PdfViewerBrowserTest : public client::ClientAppBrowser::Delegate { - public: - PdfViewerBrowserTest() {} - - void OnBeforeCommandLineProcessing( - CefRefPtr app, - CefRefPtr command_line) override { - // Allow all plugin loading by default. - command_line->AppendSwitchWithValue("plugin-policy", "allow"); - } - - private: - IMPLEMENT_REFCOUNTING(PdfViewerBrowserTest); -}; - const char kPdfHtmlUrl[] = "http://tests/pdf.html"; const char kPdfDirectUrl[] = "http://tests/pdf.pdf"; @@ -243,10 +227,3 @@ RUN_TEST(GlobalNoHandlerPdfHtml, GLOBAL_NO_HANDLER, kPdfHtmlUrl) RUN_TEST(CustomNoHandlerPdfDirect, CUSTOM_NO_HANDLER, kPdfDirectUrl) RUN_TEST(CustomNoHandlerPdfHtml, CUSTOM_NO_HANDLER, kPdfHtmlUrl) - -// Entry point for creating PDF viewer browser test objects. -// Called from client_app_delegates.cc. -void CreatePdfViewerBrowserTests( - client::ClientAppBrowser::DelegateSet& delegates) { - delegates.insert(new PdfViewerBrowserTest); -} diff --git a/tests/ceftests/urlrequest_unittest.cc b/tests/ceftests/urlrequest_unittest.cc index 2bfb9994c..5361569b4 100644 --- a/tests/ceftests/urlrequest_unittest.cc +++ b/tests/ceftests/urlrequest_unittest.cc @@ -3554,7 +3554,7 @@ TEST(URLRequestTest, BrowserInvalidURL) { client->RunTest(); } -// Entry point for creating plugin browser test objects. +// Entry point for creating URLRequest browser test objects. // Called from client_app_delegates.cc. void CreateURLRequestBrowserTests( client::ClientAppBrowser::DelegateSet& delegates) { diff --git a/tools/cef_parser.py b/tools/cef_parser.py index ebd49a222..d21f95869 100644 --- a/tools/cef_parser.py +++ b/tools/cef_parser.py @@ -394,7 +394,6 @@ _simpletypes = { 'char* const': ['char* const', 'NULL'], 'cef_color_t': ['cef_color_t', '0'], 'cef_json_parser_error_t': ['cef_json_parser_error_t', 'JSON_NO_ERROR'], - 'cef_plugin_policy_t': ['cef_plugin_policy_t', 'PLUGIN_POLICY_ALLOW'], 'CefCursorHandle': ['cef_cursor_handle_t', 'kNullCursorHandle'], 'CefCompositionUnderline': [ 'cef_composition_underline_t', 'CefCompositionUnderline()'