| Index: src/core/SkPictureRecord.cpp
|
| diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
|
| index 562f056c501d6df226f4c3821b4a24926e4ceee2..f2a0fd857c3a4338626ebea35737c61cef2fc849 100644
|
| --- a/src/core/SkPictureRecord.cpp
|
| +++ b/src/core/SkPictureRecord.cpp
|
| @@ -219,7 +219,6 @@
|
| }
|
|
|
| void SkPictureRecord::didTranslateZ(SkScalar z) {
|
| -#ifdef SK_EXPERIMENTAL_SHADOWING
|
| this->validate(fWriter.bytesWritten(), 0);
|
| // op + scalar
|
| size_t size = 1 * kUInt32Size + 1 * sizeof(SkScalar);
|
| @@ -227,7 +226,6 @@
|
| this->addScalar(z);
|
| this->validate(initialOffset, size);
|
| this->INHERITED::didTranslateZ(z);
|
| -#endif
|
| }
|
|
|
| static bool regionOpExpands(SkRegion::Op op) {
|
| @@ -656,27 +654,6 @@
|
|
|
| void SkPictureRecord::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
|
| const SkPaint* paint) {
|
| - // op + picture index
|
| - size_t size = 2 * kUInt32Size;
|
| - size_t initialOffset;
|
| -
|
| - if (nullptr == matrix && nullptr == paint) {
|
| - initialOffset = this->addDraw(DRAW_PICTURE, &size);
|
| - this->addPicture(picture);
|
| - } else {
|
| - const SkMatrix& m = matrix ? *matrix : SkMatrix::I();
|
| - size += m.writeToMemory(nullptr) + kUInt32Size; // matrix + paint
|
| - initialOffset = this->addDraw(DRAW_PICTURE_MATRIX_PAINT, &size);
|
| - this->addPaintPtr(paint);
|
| - this->addMatrix(m);
|
| - this->addPicture(picture);
|
| - }
|
| - this->validate(initialOffset, size);
|
| -}
|
| -
|
| -void SkPictureRecord::onDrawShadowedPicture(const SkPicture* picture,
|
| - const SkMatrix* matrix,
|
| - const SkPaint* paint) {
|
| // op + picture index
|
| size_t size = 2 * kUInt32Size;
|
| size_t initialOffset;
|
|
|