[go: nahoru, domu]

[//media][Blink] Give killswitches distinct names

The base::Features used for these killswitches must have distinct names,
or the base::Feature infrastructure raises an error dynamically when
accessing one of the features. This didn't come up before now because
these are only accessed when OOP-C is turned off.

(cherry picked from commit 8317e86c0af0362926083c4bba42f44a3408e8ca)

Bug: 328302269, 328540028
Change-Id: I4920baff72700d56e09fb101e944ed8d896b959c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5349219
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Colin Blundell <blundell@chromium.org>
Reviewed-by: Frank Liberato <liberato@chromium.org>
Commit-Queue: Frank Liberato <liberato@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1269104}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5351786
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/branch-heads/6312@{#507}
Cr-Branched-From: 6711dcdae48edaf98cbc6964f90fac85b7d9986e-refs/heads/main@{#1262506}
diff --git a/media/renderers/paint_canvas_video_renderer.cc b/media/renderers/paint_canvas_video_renderer.cc
index 7637123..ded75b87 100644
--- a/media/renderers/paint_canvas_video_renderer.cc
+++ b/media/renderers/paint_canvas_video_renderer.cc
@@ -87,7 +87,7 @@
 namespace {
 
 BASE_FEATURE(kAddSharedImageRasterUsageWithNonOOPR,
-             "AddSharedImageRasterUsageWithNonOOPR",
+             "PCVRAddSharedImageRasterUsageWithNonOOPR",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 // Return the full-range RGB component of the color space of this frame's
diff --git a/media/renderers/video_frame_yuv_mailboxes_holder.cc b/media/renderers/video_frame_yuv_mailboxes_holder.cc
index 37f2116..5c21f940 100644
--- a/media/renderers/video_frame_yuv_mailboxes_holder.cc
+++ b/media/renderers/video_frame_yuv_mailboxes_holder.cc
@@ -32,7 +32,7 @@
 namespace {
 
 BASE_FEATURE(kAddSharedImageRasterUsageWithNonOOPR,
-             "AddSharedImageRasterUsageWithNonOOPR",
+             "VideoFrameYUVAddSharedImageRasterUsageWithNonOOPR",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 viz::SharedImageFormat PlaneSharedImageFormat(int num_channels,
diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource.cc b/third_party/blink/renderer/platform/graphics/canvas_resource.cc
index 0bdef94..4cca3e7c 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_resource.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_resource.cc
@@ -56,7 +56,7 @@
 namespace {
 
 BASE_FEATURE(kAddSharedImageRasterUsageWithNonOOPR,
-             "AddSharedImageRasterUsageWithNonOOPR",
+             "CanvasAddSharedImageRasterUsageWithNonOOPR",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 }  // namespace