AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

roll back minimum picture version to 73

Browse Source 
Please c.f. https://skia-review.googlesource.com/c/skia/+/302836
and the attached bug.

This restores kEdgeAAQuadColor4f_Version=73 and sets it as the minimum
we can read.  No code change is needed for this: there's still code to
handle both sides of the format change marked by the current minimum
kMorphologyTakesScalar_Version=74.  We've either mistakenly tagged the
minimum version one too high, or have forgotten to delete this code:

    sk_sp<SkFlattenable> SkMorphologyImageFilterImpl::CreateProc(SkReadBuffer& buffer) {
        SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
        SkScalar width;
        SkScalar height;
        if (buffer.isVersionLT(SkPicturePriv::kMorphologyTakesScalar_Version)) {
            width = buffer.readInt();
            height = buffer.readInt();
        } else {
            width = buffer.readScalar();
            height = buffer.readScalar();
        }
        ...

Similarly we do not need to restore any code conditioned on
buffer.isVersionLT(SkPicturePriv::kEdgeAAQuadColor4f_Version); that's
what we'd need to restore if we wanted to support v72 or earlier.

Bug: skia:10832
Change-Id: Ibf49feb401cab7dfd00582e68a3aeb1061ffe08b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335177
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2020-11-16 11:59:10 -06:00 committed by Skia Commit-Bot
parent b7c1310834
commit dae77c5b19
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/SkPicturePriv.h
View File

@ -82,6 +82,7 @@ public:
// V79: Cubic Resampler option on imageshader // V79: Cubic Resampler option on imageshader
enum Version { enum Version {
kEdgeAAQuadColor4f_Version = 73,
kMorphologyTakesScalar_Version = 74, kMorphologyTakesScalar_Version = 74,
kVerticesUseReadBuffer_Version = 75, kVerticesUseReadBuffer_Version = 75,
kFilterEnumInImageShader_Version = 76, kFilterEnumInImageShader_Version = 76,
@ -90,7 +91,7 @@ public:
kCubicResamplerImageShader_Version = 79, kCubicResamplerImageShader_Version = 79,
// Only SKPs within the min/current picture version range (inclusive) can be read. // Only SKPs within the min/current picture version range (inclusive) can be read.
kMin_Version = kMorphologyTakesScalar_Version, kMin_Version = kEdgeAAQuadColor4f_Version,
kCurrent_Version = kCubicResamplerImageShader_Version kCurrent_Version = kCubicResamplerImageShader_Version
}; };