Remove SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX.
This is no longer needed by Android.
BUG=skia:1976
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/379323002
diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
index ebb480f..93d80ea 100644
--- a/gyp/skia_for_android_framework_defines.gypi
+++ b/gyp/skia_for_android_framework_defines.gypi
@@ -19,7 +19,6 @@
'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
# Transitional, for deprecated SkCanvas::SaveFlags methods.
'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
- 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
],
},
}
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 33a7a15..e5af40d 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -55,19 +55,6 @@
*/
bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); }
-#ifdef SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX
- /**
- * Set the shader's local matrix.
- * @param localM The shader's new local matrix.
- */
- void setLocalMatrix(const SkMatrix& localM) { fLocalMatrix = localM; }
-
- /**
- * Reset the shader's local matrix to identity.
- */
- void resetLocalMatrix() { fLocalMatrix.reset(); }
-#endif
-
enum TileMode {
/** replicate the edge color if the shader draws outside of its
* original bounds
@@ -479,6 +466,8 @@
virtual Context* onCreateContext(const ContextRec&, void* storage) const;
private:
+ // This is essentially const, but not officially so it can be modified in
+ // constructors.
SkMatrix fLocalMatrix;
// So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer constructor.
diff --git a/src/core/SkPaintPriv.cpp b/src/core/SkPaintPriv.cpp
index a8b52e9..10ff95c 100644
--- a/src/core/SkPaintPriv.cpp
+++ b/src/core/SkPaintPriv.cpp
@@ -86,9 +86,6 @@
* false.
*/
return false
-#ifdef SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX
- || paint.getShader()
-#endif
#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
|| paint.getRasterizer()
#endif