Index: include/effects/SkGradientShader.h |
diff --git a/include/effects/SkGradientShader.h b/include/effects/SkGradientShader.h |
index af88080d1839f085a0736c6b249dc2bc17fa9772..a5b4f29b7604e29fa31d5a4bfa73e6a1be60d7aa 100644 |
--- a/include/effects/SkGradientShader.h |
+++ b/include/effects/SkGradientShader.h |
@@ -53,15 +53,6 @@ public: |
return CreateLinear(pts, colors, pos, count, mode, 0, NULL); |
} |
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES |
- static SkShader* CreateLinear(const SkPoint pts[2], |
- const SkColor colors[], const SkScalar pos[], int count, |
- SkShader::TileMode mode, void* /*ignored*/, |
- uint32_t flags, const SkMatrix* localMatrix) { |
- return CreateLinear(pts, colors, pos, count, mode, flags, localMatrix); |
- } |
-#endif |
- |
/** Returns a shader that generates a radial gradient given the center and radius. |
<p /> |
CreateRadial returns a shader with a reference count of 1. |
@@ -89,15 +80,6 @@ public: |
return CreateRadial(center, radius, colors, pos, count, mode, 0, NULL); |
} |
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES |
- static SkShader* CreateRadial(const SkPoint& center, SkScalar radius, |
- const SkColor colors[], const SkScalar pos[], int count, |
- SkShader::TileMode mode, void* /*ignored*/, |
- uint32_t flags, const SkMatrix* localMatrix) { |
- return CreateRadial(center, radius, colors, pos, count, mode, flags, localMatrix); |
- } |
-#endif |
- |
/** Returns a shader that generates a radial gradient given the start position, start radius, end position and end radius. |
<p /> |
CreateTwoPointRadial returns a shader with a reference count of 1. |
@@ -131,17 +113,6 @@ public: |
0, NULL); |
} |
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES |
- static SkShader* CreateTwoPointRadial(const SkPoint& start, SkScalar startRadius, |
- const SkPoint& end, SkScalar endRadius, |
- const SkColor colors[], const SkScalar pos[], int count, |
- SkShader::TileMode mode, void* /*ignored*/, |
- uint32_t flags, const SkMatrix* localMatrix) { |
- return CreateTwoPointRadial(start, startRadius, end, endRadius, colors, pos, count, mode, |
- flags, localMatrix); |
- } |
-#endif |
- |
/** |
* Returns a shader that generates a conical gradient given two circles, or |
* returns NULL if the inputs are invalid. The gradient interprets the |
@@ -162,17 +133,6 @@ public: |
0, NULL); |
} |
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES |
- static SkShader* CreateTwoPointConical(const SkPoint& start, SkScalar startRadius, |
- const SkPoint& end, SkScalar endRadius, |
- const SkColor colors[], const SkScalar pos[], int count, |
- SkShader::TileMode mode, void* /*ignored*/, |
- uint32_t flags, const SkMatrix* localMatrix) { |
- return CreateTwoPointConical(start, startRadius, end, endRadius, colors, pos, count, mode, |
- flags, localMatrix); |
- } |
-#endif |
- |
/** Returns a shader that generates a sweep gradient given a center. |
<p /> |
CreateSweep returns a shader with a reference count of 1. |
@@ -197,15 +157,6 @@ public: |
return CreateSweep(cx, cy, colors, pos, count, 0, NULL); |
} |
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES |
- static SkShader* CreateSweep(SkScalar cx, SkScalar cy, |
- const SkColor colors[], const SkScalar pos[], int count, |
- void* /*ignored*/, |
- uint32_t flags, const SkMatrix* localMatrix) { |
- return CreateSweep(cx, cy, colors, pos, count, flags, localMatrix); |
- } |
-#endif |
- |
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() |
}; |