diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkPath.cpp | 7 | ||||
-rw-r--r-- | src/core/SkPicture.cpp | 11 | ||||
-rw-r--r-- | src/core/SkPicturePlayback.cpp | 13 |
3 files changed, 5 insertions, 26 deletions
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 571452a7d9..6c48e56b5f 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -2049,11 +2049,8 @@ size_t SkPath::writeToMemory(void* storage) const { (fFillType << kFillType_SerializationShift) | (fSegmentMask << kSegmentMask_SerializationShift) | (fDirection << kDirection_SerializationShift) -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO - | (0x1 << kNewFormat_SerializationShift) -#endif #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO - | (0x1 << kNewFormat2_SerializationShift) + | (0x1 << kNewFormat_SerializationShift) #endif ; @@ -2078,7 +2075,7 @@ size_t SkPath::readFromMemory(const void* storage, size_t length) { fSegmentMask = (packed >> kSegmentMask_SerializationShift) & 0xF; fDirection = (packed >> kDirection_SerializationShift) & 0x3; #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO - bool newFormat = (packed >> kNewFormat2_SerializationShift) & 1; + bool newFormat = (packed >> kNewFormat_SerializationShift) & 1; #endif SkPathRef* pathRef = SkPathRef::CreateFromBuffer(&buffer diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index a5faf4d0a0..9531d189ef 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -284,18 +284,11 @@ bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) { if (!stream->read(&info, sizeof(SkPictInfo))) { return false; } + if (PICTURE_VERSION != info.fVersion -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO - // V13 is backwards compatible with V12 - && PRIOR_PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .skps regenerated -#endif -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO - // V14 is backwards compatible with V13 - && PRIOR_PICTURE_VERSION2 != info.fVersion // TODO: remove when .skps regenerated -#endif #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO // V16 is backwards compatible with V15 - && PRIOR_PICTURE_VERSION3 != info.fVersion // TODO: remove when .skps regenerated + && PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .skps regenerated #endif ) { return false; diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp index 5a016d48d6..82c7a03bcd 100644 --- a/src/core/SkPicturePlayback.cpp +++ b/src/core/SkPicturePlayback.cpp @@ -882,18 +882,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) const SkRect* src = this->getRectPtr(reader); // may be null const SkRect& dst = reader.skipT<SkRect>(); // required SkCanvas::DrawBitmapRectFlags flags; -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO - flags = SkCanvas::kNone_DrawBitmapRectFlag; - // TODO: remove this backwards compatibility code once the .skps are - // regenerated - SkASSERT(32 == size || 48 == size || // old sizes - 36 == size || 52 == size); // new sizes - if (36 == size || 52 == size) { -#endif - flags = (SkCanvas::DrawBitmapRectFlags) reader.readInt(); -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO - } -#endif + flags = (SkCanvas::DrawBitmapRectFlags) reader.readInt(); canvas.drawBitmapRectToRect(bitmap, src, dst, paint, flags); } break; case DRAW_BITMAP_MATRIX: { |