Fix master-skia build

TBR=djsollen@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2159223003

Review-Url: https://codereview.chromium.org/2159223003

diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp
index 55ec7d9d7b031d9b8c890c64e073c8e349255d58..45bd293991785446c90bdc5ee21f971216bb6755 100644 (file)
--- a/bench/ColorCodecBench.cpp
+++ b/bench/ColorCodecBench.cpp
@@ -199,7 +199,12 @@ void ColorCodecBench::onDelayedSetup() {
 }
 
 void ColorCodecBench::onDraw(int n, SkCanvas*) {
-    if ((FLAGS_srgb || FLAGS_qcms) && FLAGS_half) {
+#if defined(SK_TEST_QCMS)
+    bool to8888 = FLAGS_srgb || FLAGS_qcms;
+#else
+    bool to8888 = FLAGS_srgb;
+#endif
+    if (to8888 && FLAGS_half) {
         SkDebugf("Error: Contradicting flags.\n");
         return;
     }