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/gm/gmmain.cpp b/gm/gmmain.cpp
index 662e9814840b676dd2035b9948bae488cc96dbd8..fb50b1e34eddf34867e909279adfb67fe1d7aef5 100644 (file)
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1498,7 +1498,7 @@ static SkData* encode_to_dct_data(size_t*, const SkBitmap& bitmap) {
     // Workaround bug #1043 where bitmaps with referenced pixels cause
     // CGImageDestinationFinalize to crash
     SkBitmap copy;
-    bitmap.deepCopyTo(&copy, bitmap.config());
+    bitmap.deepCopyTo(&copy);
     bm = copy;
 #endif
 

diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 06ffcb0f6977a0086661b67e807952dc644064c2..578865eb809e18bb4a89be50f038ee7cde9609df 100644 (file)
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -16,6 +16,8 @@
 
 //#define SK_SUPPORT_LEGACY_COPYTO_CONFIG
 
+//#define SK_SUPPORT_DEEPCOPYTO_CONFIG
+
 struct SkMask;
 struct SkIRect;
 struct SkRect;
@@ -24,9 +26,6 @@ class SkPixelRef;
 class SkPixelRefFactory;
 class SkRegion;
 class SkString;
-
-#define SK_SUPPORT_DEEPCOPYTO_CONFIG
-
 class GrTexture;
 
 /** \class SkBitmap

diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index af3fbdacbfcba0f0ef1ecfe18de87152c3e140bb..bf22ea7e463d8d1b7a3e3803e739afb3f8ed6583 100644 (file)
--- 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 @@ static const char* gColorTypeName[] = {
     "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 @@ static void TestIndividualCopy(skiatest::Reporter* reporter, const SkColorType d
     }
 
 }
+#endif
 
 // Stripped down version of TestBitmapCopy that checks basic fields (width, height, config, genID)
 // to ensure that they were copied properly.

diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp
index 07c894f7536bda2af8a622cb72d652793e3e9927..7790e2a4e76f9a038f7a189015e69f5e23395af9 100644 (file)
--- a/tools/render_pdfs_main.cpp
+++ b/tools/render_pdfs_main.cpp
@@ -93,7 +93,7 @@ static SkData* encode_to_dct_data(size_t*, const SkBitmap& bitmap) {
     // Workaround bug #1043 where bitmaps with referenced pixels cause
     // CGImageDestinationFinalize to crash
     SkBitmap copy;
-    bitmap.deepCopyTo(&copy, bitmap.config());
+    bitmap.deepCopyTo(&copy);
     bm = copy;
 #endif