diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-17 14:15:23 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-02-27 14:10:55 -0500 |
| commit | 341c93bd153d8fcc55114b0148301e98e34bc13c (patch) | |
| tree | a4d9d96bbe441b5198b3e08c94c12a6034762b33 /include | |
| parent | 43ccec49e8a1f058730cf41d68c6a5c1b9450579 (diff) | |
| download | external_skia-341c93bd153d8fcc55114b0148301e98e34bc13c.zip external_skia-341c93bd153d8fcc55114b0148301e98e34bc13c.tar.gz external_skia-341c93bd153d8fcc55114b0148301e98e34bc13c.tar.bz2 | |
Changes to preserve backwards compatibility for serialization
Skia's serialize methods are not intended for backwards compatibility,
but the browser used it to implement saved pages. As a result the
revision of Skia used for ICS (r1562) is not compatible with the
revision of Skia used in JB (r3000+). This CL attempts to make pages
saved in ICS render in JB while still allowing JB pages to be saved
and displayed.
bug: 6025365
Change-Id: I9983517b46d2dedf31c6d90f48f6cf00ec042bc2
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkFlattenable.h | 5 | ||||
| -rw-r--r-- | include/core/SkUserConfig.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index a66638e..34ca34e 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -161,6 +161,9 @@ public: void* readFunctionPtr(); SkFlattenable* readFlattenable(); + void setPictureVersion(uint32_t version) { fPictureVersion = version; } + uint32_t getPictureVersion() { return fPictureVersion; } + private: SkRefCnt** fRCArray; int fRCCount; @@ -172,6 +175,8 @@ private: SkFlattenable::Factory* fFactoryArray; int fFactoryCount; + uint32_t fPictureVersion; + typedef SkReader32 INHERITED; }; diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h index b409e82..4bcf2e3 100644 --- a/include/core/SkUserConfig.h +++ b/include/core/SkUserConfig.h @@ -41,6 +41,9 @@ // ANDROID Specific changes - NO NOT CHECK BACK INTO code.google.com/p/skia // +#define PICTURE_VERSION_ICS 1 // r1562 of Skia +#define PICTURE_VERSION_JB 2 + // do this build check for other tools that still read this header #ifdef ANDROID #include <utils/misc.h> |