diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index dc50876d7..e6e860a9b 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/110.0.5481.30', + 'chromium_checkout': 'refs/tags/110.0.5481.38', 'depot_tools_checkout': '252b19866a' } diff --git a/libcef/common/alloy/alloy_content_client.cc b/libcef/common/alloy/alloy_content_client.cc index dec9977f4..0ec1cba99 100644 --- a/libcef/common/alloy/alloy_content_client.cc +++ b/libcef/common/alloy/alloy_content_client.cc @@ -47,9 +47,9 @@ namespace { // The following plugin-related methods are from // chrome/common/chrome_content_client.cc -const char kPDFPluginExtension[] = "pdf"; -const char kPDFPluginDescription[] = "Portable Document Format"; -const uint32_t kPDFPluginPermissions = +constexpr char kPDFPluginExtension[] = "pdf"; +constexpr char kPDFPluginDescription[] = "Portable Document Format"; +constexpr uint32_t kPDFPluginPermissions = ppapi::PERMISSION_PDF | ppapi::PERMISSION_DEV; // Appends the known built-in plugins to the given vector. Some built-in @@ -64,7 +64,7 @@ void ComputeBuiltInPlugins(std::vector* plugins) { pdf_info.is_out_of_process = true; pdf_info.name = ChromeContentClient::kPDFInternalPluginName; pdf_info.description = kPDFPluginDescription; - pdf_info.path = base::FilePath(ChromeContentClient::kPDFPluginPath); + pdf_info.path = base::FilePath(ChromeContentClient::kPDFInternalPluginPath); content::WebPluginMimeType pdf_mime_type(pdf::kInternalPluginMimeType, kPDFPluginExtension, kPDFPluginDescription); diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 4715ab19a..b2c643584 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc -index 7ceb1d7b854d9..721026a5a4be1 100644 +index 7b12e246839a4..b29450cc2285a 100644 --- chrome/browser/plugins/plugin_info_host_impl.cc +++ chrome/browser/plugins/plugin_info_host_impl.cc -@@ -135,6 +135,10 @@ bool IsPluginLoadingAccessibleResourceInWebView( +@@ -142,6 +142,10 @@ bool IsPluginLoadingAccessibleResourceInWebView( extensions::ExtensionRegistry* extension_registry, int process_id, const GURL& resource) { @@ -42,7 +42,7 @@ index 8b3f569882aeb..afc8007a6228b 100644 const extensions::Extension* extension = registry->enabled_extensions().GetByID(extension_id); diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index 3d08b706ec4a0..7f4a0398e51f9 100644 +index a800280bc057b..af108b1ec8c25 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc @@ -978,6 +978,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(