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

signal on bad picture op, simplify other ops

Browse Source 
Bug: skia:7569
Change-Id: Iec5d7472e6cdb0fe87a634209c5349085c9ebfbd
Reviewed-on: https://skia-review.googlesource.com/102424
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2018-02-01 15:52:58 -05:00 committed by Skia Commit-Bot
parent d0d7270fcc
commit 18ff51c46d
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/SkPicturePlayback.cpp
View File

@ -684,8 +684,6 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
break;
case ROTATE: {
auto deg = reader->readScalar();
BREAK_ON_READ_ERROR(reader);
canvas->rotate(deg);
} break;
case SAVE:
@ -734,34 +732,27 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
case SCALE: {
SkScalar sx = reader->readScalar();
SkScalar sy = reader->readScalar();
BREAK_ON_READ_ERROR(reader);
canvas->scale(sx, sy);
} break;
case SET_MATRIX: {
SkMatrix matrix;
reader->readMatrix(&matrix);
BREAK_ON_READ_ERROR(reader);
matrix.postConcat(initialMatrix);
canvas->setMatrix(matrix);
} break;
case SKEW: {
SkScalar sx = reader->readScalar();
SkScalar sy = reader->readScalar();
BREAK_ON_READ_ERROR(reader);
canvas->skew(sx, sy);
} break;
case TRANSLATE: {
SkScalar dx = reader->readScalar();
SkScalar dy = reader->readScalar();
BREAK_ON_READ_ERROR(reader);
canvas->translate(dx, dy);
} break;
default:
SkASSERTF(false, "Unknown draw type: %d", op);
reader->validate(false); // unknown op
break;
}
#undef BREAK_ON_READ_ERROR