Commit ffceae7e authored by Chris Blume's avatar Chris Blume Committed by Commit Bot

Always-wide-color should prevent dynamic color

Currently, the tests for always-wide and dynamic-wide are
separate. A bug was found and fixed [1] where the always-wide
support wasn't being checked when dynamic-wide was enabled.

This CL returns false in the dynamic-wide test if always-wide
is enabled.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2102777

Bug: 955158
Change-Id: I7c5ce5dd2f7704687dee5753d699557450edb177
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2103138Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Commit-Queue: Chris Blume <cblume@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750306}
parent b5faf62e
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "build/chromecast_buildflags.h" #include "build/chromecast_buildflags.h"
#include "components/viz/common/switches.h" #include "components/viz/common/switches.h"
#include "components/viz/common/viz_utils.h"
#include "gpu/config/gpu_finch_features.h" #include "gpu/config/gpu_finch_features.h"
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
...@@ -97,6 +98,8 @@ bool IsRecordingSkPicture() { ...@@ -97,6 +98,8 @@ bool IsRecordingSkPicture() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
bool IsDynamicColorGamutEnabled() { bool IsDynamicColorGamutEnabled() {
if (viz::AlwaysUseWideColorGamut())
return false;
return base::FeatureList::IsEnabled(kDynamicColorGamut); return base::FeatureList::IsEnabled(kDynamicColorGamut);
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment