Add SK_SUPPORT_LEGACY_PORTER_DUFF macro.

This trick will be used to remove deprecated SkPorterDuff API. But first
we need to add it so Android can be updated later.

BUG=skia:3178
R=scroggo@google.com

Review URL: https://codereview.chromium.org/758133004

diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
index f10f3e651cf72d6cd71bcd225322ca33f51a5f27..ee0e1f3e0d851bafb569dfacddd5c661c39d56a5 100644 (file)
--- a/gyp/skia_for_android_framework_defines.gypi
+++ b/gyp/skia_for_android_framework_defines.gypi
@@ -20,6 +20,8 @@
       'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
       'SK_LEGACY_PICTURE_SIZE_API',
       'SK_LEGACY_PICTURE_DRAW_API',
+      # TODO(tfarina): Remove this when Android is fixed. skbug.com/3178
+      'SK_SUPPORT_LEGACY_PORTER_DUFF',
     ],
   },
 }

diff --git a/include/effects/SkPorterDuff.h b/include/effects/SkPorterDuff.h
index e984e8e9b427d1162ff6e004f3c1807a8f3ca0d0..7a62e47960ef85cafa5b8d5c0111614bb8c63c6d 100644 (file)
--- a/include/effects/SkPorterDuff.h
+++ b/include/effects/SkPorterDuff.h
@@ -11,6 +11,12 @@
 #include "SkColor.h"
 #include "SkXfermode.h"
 
+//#define SK_SUPPORT_LEGACY_PORTER_DUFF
+
+// Temporary guard until we can remove the dependencies in android. Then we
+// plan to remove this entirely.
+#ifdef SK_SUPPORT_LEGACY_PORTER_DUFF
+
 class SkXfermode;
 
 class SK_API SkPorterDuff {
@@ -77,3 +83,5 @@ public:
 } SK_ATTR_DEPRECATED("use SkXfermode::Mode");
 
 #endif
+
+#endif

diff --git a/src/effects/SkPorterDuff.cpp b/src/effects/SkPorterDuff.cpp
index 4cdcf798a1c527b869502ea44ffa163fb2621f16..5564ca7c0232439aadaba9e277c53554f54481ca 100644 (file)
--- a/src/effects/SkPorterDuff.cpp
+++ b/src/effects/SkPorterDuff.cpp
@@ -10,6 +10,8 @@
 #include "SkPorterDuff.h"
 #include "SkXfermode.h"
 
+#ifdef SK_SUPPORT_LEGACY_PORTER_DUFF
+
 /*  This file just exists as a compatibility layer, gluing the PorterDuff API
     into the (extended) SkXfermode API
  */
@@ -85,3 +87,5 @@ SkXfermodeProc SkPorterDuff::GetXfermodeProc(Mode mode) {
 SkXfermodeProc16 SkPorterDuff::GetXfermodeProc16(Mode mode, SkColor srcColor) {
     return SkXfermode::GetProc16(gPairs[mode].fXF, srcColor);
 }
+
+#endif