Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: include/core/SkShader.h

Issue 278903002: Revert of hide get/setLocalMatrix (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | samplecode/SampleFatBits.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkShader.h
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 87e10ceb2faba6dabdeeec3e93d498480ad0c9c8..2f3764c0be032d9e566393fadebeda59bd1c3078 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -38,15 +38,14 @@
virtual ~SkShader();
/**
+ * Returns true if the local matrix is not an identity matrix.
+ */
+ bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); }
+
+ /**
* Returns the local matrix.
*/
const SkMatrix& getLocalMatrix() const { return fLocalMatrix; }
-
-#ifdef SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX
- /**
- * Returns true if the local matrix is not an identity matrix.
- */
- bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); }
/**
* Set the shader's local matrix.
@@ -58,7 +57,6 @@
* 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
« no previous file with comments | « no previous file | samplecode/SampleFatBits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698