Use SK_TEST_QCMS to mark qcms test code
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2031053005
Review-Url: https://codereview.chromium.org/2031053005
diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp
index 1b0ddb3..85785d8 100644
--- a/bench/ColorCodecBench.cpp
+++ b/bench/ColorCodecBench.cpp
@@ -11,19 +11,19 @@
#include "SkColorSpaceXform.h"
#include "SkCommandLineFlags.h"
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
DEFINE_bool(qcms, false, "Bench qcms color conversion");
#endif
DEFINE_bool(xform_only, false, "Only time the color xform, do not include the decode time");
ColorCodecBench::ColorCodecBench(const char* name, sk_sp<SkData> encoded)
: fEncoded(std::move(encoded))
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
, fDstSpaceQCMS(nullptr)
#endif
{
fName.appendf("Color%s", FLAGS_xform_only ? "Xform" : "Codec");
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
fName.appendf("%s", FLAGS_qcms ? "QCMS" : "");
#endif
fName.appendf("_%s", name);
@@ -65,7 +65,7 @@
}
}
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
void ColorCodecBench::decodeAndXformQCMS() {
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fEncoded.get()));
#ifdef SK_DEBUG
@@ -121,7 +121,7 @@
}
}
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
void ColorCodecBench::xformOnlyQCMS() {
SkAutoTCallVProc<qcms_profile, qcms_profile_release>
srcSpace(qcms_profile_from_memory(fSrcData->data(), fSrcData->size()));
@@ -168,7 +168,7 @@
SkASSERT(dstData);
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
if (FLAGS_qcms) {
fDstSpaceQCMS.reset(qcms_profile_from_memory(dstData->data(), dstData->size()));
SkASSERT(fDstSpaceQCMS);
@@ -182,7 +182,7 @@
void ColorCodecBench::onDraw(int n, SkCanvas*) {
for (int i = 0; i < n; i++) {
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
if (FLAGS_qcms) {
if (FLAGS_xform_only) {
this->xformOnlyQCMS();
diff --git a/bench/ColorCodecBench.h b/bench/ColorCodecBench.h
index 570890d..9da505f 100644
--- a/bench/ColorCodecBench.h
+++ b/bench/ColorCodecBench.h
@@ -12,7 +12,7 @@
#include "SkData.h"
#include "SkImageInfo.h"
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
#include "qcms.h"
#endif
@@ -40,7 +40,7 @@
SkAutoMalloc fDst;
SkAutoMalloc fSrc;
sk_sp<SkColorSpace> fDstSpace;
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
SkAutoTCallVProc<qcms_profile, qcms_profile_release> fDstSpaceQCMS;
#endif
sk_sp<SkData> fSrcData;
diff --git a/dm/DM.cpp b/dm/DM.cpp
index c4e7d15..61a3d2e 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -746,7 +746,7 @@
src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_HPZR30w_Mode);
push_src("image", "color_codec_HPZR30w", src);
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
src = new ColorCodecSrc(colorImage, ColorCodecSrc::kQCMS_HPZR30w_Mode);
push_src("image", "color_codec_QCMS_HPZR30w", src);
#endif
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 5ea4ff0..06abdce 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -41,7 +41,7 @@
#include "SkAutoCoInitialize.h"
#endif
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
#include "qcms.h"
#endif
@@ -932,7 +932,7 @@
canvas->drawBitmap(bitmap, 0, 0);
break;
}
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
case kQCMS_HPZR30w_Mode: {
sk_sp<SkData> srcData = codec->getICCData();
SkAutoTCallVProc<qcms_profile, qcms_profile_release>
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 395f59e..8cb2b25 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -219,7 +219,7 @@
// look identical on two different dsts?
kDst_HPZR30w_Mode,
-#if !defined(GOOGLE3)
+#if defined(SK_TEST_QCMS)
// Use QCMS for color correction.
kQCMS_HPZR30w_Mode,
#endif
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index a9b0124..661e5d0 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -19,6 +19,9 @@
'SK_HAS_JPEG_LIBRARY',
'SK_HAS_PNG_LIBRARY',
'SK_HAS_WEBP_LIBRARY',
+
+ # Temporarily test against the QCMS library.
+ 'SK_TEST_QCMS',
],
'conditions' : [
[ 'skia_is_bot', {