bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2024-12-28 18:41:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CHECK on startup when running with --trace-startup=mojom (see issue #2622).

Browse Source
This commit is contained in:
Marshall Greenblatt 2019-03-27 14:39:35 -04:00
parent 9ce29e8ec5
commit 941d53ebfd
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patch/patch.cfg
View File

@ -416,5 +416,11 @@ patches = [
# Windows: Revert base::Value change which breaks cef_sandbox build.
# https://bugs.chromium.org/p/chromium/issues/detail?id=646113#c173
'name': 'base_value_646113',
},
{
# Fix CHECK on startup when running with --trace-startup=mojom.
# This change can be removed once we bump Chromium past the following:
# https://bugs.chromium.org/p/chromium/issues/detail?id=839084#c60
'name': 'services_tracing_839084',
}
]

24
patch/patches/services_tracing_839084.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git services/tracing/public/cpp/tracing_features.cc services/tracing/public/cpp/tracing_features.cc
index 08887d9243d6..c098a44cf1ad 100644
--- services/tracing/public/cpp/tracing_features.cc
+++ services/tracing/public/cpp/tracing_features.cc
@@ -34,9 +34,16 @@ const base::Feature kTracingServiceInProcess {
namespace tracing {
bool TracingUsesPerfettoBackend() {
- return base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnablePerfetto) ||
- base::FeatureList::IsEnabled(features::kTracingPerfettoBackend);
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePerfetto)) {
+ return true;
+ }
+
+ if (base::FeatureList::GetInstance()) {
+ return base::FeatureList::IsEnabled(features::kTracingPerfettoBackend);
+ }
+
+ return false;
}
} // namespace tracing