Do not define SK_SUPPORT_DEEPCOPYTO_CONFIG in Skia.
Clean up our callers who depend on the deprecated function.
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/178003003
git-svn-id: http://skia.googlecode.com/svn/trunk@13566 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index af3fbda..bf22ea7 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -19,6 +19,12 @@
#include "SkRect.h"
#include "Test.h"
+struct Pair {
+ SkColorType fColorType;
+ const char* fValid;
+};
+
+#ifdef SK_SUPPORT_DEEPCOPYTO_CONFIG
static const char* boolStr(bool value) {
return value ? "true" : "false";
}
@@ -28,11 +34,6 @@
"None", "8888"
};
-struct Pair {
- SkColorType fColorType;
- const char* fValid;
-};
-
/**
* Check to ensure that copying a GPU-backed SkBitmap behaved as expected.
* @param reporter Used to report failures.
@@ -99,6 +100,7 @@
}
}
+#endif
// Stripped down version of TestBitmapCopy that checks basic fields (width, height, config, genID)
// to ensure that they were copied properly.