diff options
| author | John Reck <jreck@google.com> | 2014-08-25 12:42:35 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-08-25 12:43:02 -0700 |
| commit | f51de259ada8dacd44eca41945b49a8dba1606ae (patch) | |
| tree | 1ac6009f354cfdc99730c5fae7e6c625ce9cf843 | |
| parent | daa6f955026aa7861d5fe26464c9a05e1d363aa9 (diff) | |
| download | skia-f51de259ada8dacd44eca41945b49a8dba1606ae.tar.gz | |
DO NOT MERGE Support SkShader generation id
Bug: 16733996
Change-Id: I6958fd7c678d70ed7e8ef0a7f0856416be64ab9a
| -rw-r--r-- | include/core/SkShader.h | 7 | ||||
| -rw-r--r-- | src/core/SkShader.cpp | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 31f57cc3a6..5ec23ca94f 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -392,6 +392,9 @@ public: * to get that data. */ virtual bool asACustomShader(void** customData) const { return false; } + + uint32_t getGenerationID() const { return fGenerationID; } + void setGenerationID(uint32_t generationID) { fGenerationID = generationID; } #endif ////////////////////////////////////////////////////////////////////////// @@ -469,6 +472,10 @@ private: SkMatrix fLocalMatrix; typedef SkFlattenable INHERITED; + +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + uint32_t fGenerationID; +#endif }; #endif diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 18fb0d2584..d0067925f6 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -43,6 +43,9 @@ SkShader::SkShader(const SkMatrix* localMatrix) { } else { fLocalMatrix.reset(); } +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + fGenerationID = 0; +#endif } SkShader::SkShader(SkReadBuffer& buffer) : INHERITED(buffer) { @@ -52,6 +55,9 @@ SkShader::SkShader(SkReadBuffer& buffer) : INHERITED(buffer) { } else { fLocalMatrix.reset(); } +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + fGenerationID = 0; +#endif } SkShader::~SkShader() { |