bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 123.0.6312.107

This commit is contained in:
Marshall Greenblatt 2024-04-09 18:21:32 -04:00
parent 43f22da146
commit 63d0d96b03
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/123.0.6312.46', 'chromium_checkout': 'refs/tags/123.0.6312.107',
'depot_tools_checkout': 'cb43b5d82d' 'depot_tools_checkout': 'cb43b5d82d'
} }

34
patch/patches/linux_chrome_widevine_3149.patch
View File

@ -1,18 +1,18 @@
diff --git chrome/common/media/component_widevine_cdm_hint_file_linux.cc chrome/common/media/component_widevine_cdm_hint_file_linux.cc diff --git chrome/common/media/component_widevine_cdm_hint_file_linux.cc chrome/common/media/component_widevine_cdm_hint_file_linux.cc
index 60033bb10af50..afb0d23c07a34 100644 index d529ecfb270c4..2e922ef345f04 100644
--- chrome/common/media/component_widevine_cdm_hint_file_linux.cc --- chrome/common/media/component_widevine_cdm_hint_file_linux.cc
+++ chrome/common/media/component_widevine_cdm_hint_file_linux.cc +++ chrome/common/media/component_widevine_cdm_hint_file_linux.cc
@@ -18,6 +18,7 @@ @@ -16,6 +16,7 @@
#include "base/path_service.h"
#include "base/values.h" #include "base/values.h"
#include "base/version.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
+#include "third_party/widevine/cdm/widevine_cdm_common.h" +#include "third_party/widevine/cdm/widevine_cdm_common.h"
namespace { namespace {
@@ -25,12 +26,31 @@ namespace { @@ -35,14 +36,33 @@ base::FilePath GetPath(const base::Value::Dict& dict) {
const char kPath[] = "Path"; return path;
const char kLastBundledVersion[] = "LastBundledVersion"; }
+// On Linux the Widevine CDM is loaded into the zygote at startup. When the +// On Linux the Widevine CDM is loaded into the zygote at startup. When the
+// component updater runs sometime later and finds a newer version of the +// component updater runs sometime later and finds a newer version of the
@ -34,17 +34,9 @@ index 60033bb10af50..afb0d23c07a34 100644
+ return true; + return true;
+} +}
+ +
// Returns the hint file contents as a Value::Dict. Returned result may be an } // namespace
// empty dictionary if the hint file does not exist or is formatted incorrectly.
base::Value::Dict GetHintFileContents() {
base::FilePath hint_file_path;
- CHECK(base::PathService::Get(chrome::FILE_COMPONENT_WIDEVINE_CDM_HINT,
- &hint_file_path));
+ CHECK(GetHintFilePath(&hint_file_path));
DVLOG(1) << __func__ << " checking " << hint_file_path;
if (!base::PathExists(hint_file_path)) { bool UpdateWidevineCdmHintFile(const base::FilePath& cdm_base_path) {
@@ -65,8 +85,7 @@ bool UpdateWidevineCdmHintFile(const base::FilePath& cdm_base_path,
DCHECK(!cdm_base_path.empty()); DCHECK(!cdm_base_path.empty());
base::FilePath hint_file_path; base::FilePath hint_file_path;
@ -54,3 +46,13 @@ index 60033bb10af50..afb0d23c07a34 100644
base::Value::Dict dict; base::Value::Dict dict;
dict.Set(kPath, cdm_base_path.value()); dict.Set(kPath, cdm_base_path.value());
@@ -60,8 +80,7 @@ bool UpdateWidevineCdmHintFile(const base::FilePath& cdm_base_path) {
base::FilePath GetLatestComponentUpdatedWidevineCdmDirectory() {
base::FilePath hint_file_path;
- CHECK(base::PathService::Get(chrome::FILE_COMPONENT_WIDEVINE_CDM_HINT,
- &hint_file_path));
+ CHECK(GetHintFilePath(&hint_file_path));
if (!base::PathExists(hint_file_path)) {
DVLOG(2) << "CDM hint file at " << hint_file_path << " does not exist.";