| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkCanvas.h" | 8 #include "SkCanvas.h" |
| 9 #include "SkPatchUtils.h" | 9 #include "SkPatchUtils.h" |
| 10 #include "SkPictureData.h" | 10 #include "SkPictureData.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 } break; | 232 } break; |
| 233 case DRAW_CLEAR: | 233 case DRAW_CLEAR: |
| 234 canvas->clear(reader->readInt()); | 234 canvas->clear(reader->readInt()); |
| 235 break; | 235 break; |
| 236 case DRAW_DATA: { | 236 case DRAW_DATA: { |
| 237 // This opcode is now dead, just need to skip it for backwards compa
tibility | 237 // This opcode is now dead, just need to skip it for backwards compa
tibility |
| 238 size_t length = reader->readInt(); | 238 size_t length = reader->readInt(); |
| 239 (void)reader->skip(length); | 239 (void)reader->skip(length); |
| 240 // skip handles padding the read out to a multiple of 4 | 240 // skip handles padding the read out to a multiple of 4 |
| 241 } break; | 241 } break; |
| 242 case DRAW_DRAWABLE: |
| 243 canvas->drawDrawable(fPictureData->getDrawable(reader)); |
| 244 break; |
| 245 case DRAW_DRAWABLE_MATRIX: { |
| 246 SkMatrix matrix; |
| 247 reader->readMatrix(&matrix); |
| 248 SkDrawable* drawable = fPictureData->getDrawable(reader); |
| 249 canvas->drawDrawable(drawable, &matrix); |
| 250 } break; |
| 242 case DRAW_DRRECT: { | 251 case DRAW_DRRECT: { |
| 243 const SkPaint& paint = *fPictureData->getPaint(reader); | 252 const SkPaint& paint = *fPictureData->getPaint(reader); |
| 244 SkRRect outer, inner; | 253 SkRRect outer, inner; |
| 245 reader->readRRect(&outer); | 254 reader->readRRect(&outer); |
| 246 reader->readRRect(&inner); | 255 reader->readRRect(&inner); |
| 247 canvas->drawDRRect(outer, inner, paint); | 256 canvas->drawDRRect(outer, inner, paint); |
| 248 } break; | 257 } break; |
| 249 case BEGIN_COMMENT_GROUP: | 258 case BEGIN_COMMENT_GROUP: |
| 250 reader->readString(); | 259 reader->readString(); |
| 251 // deprecated (M44) | 260 // deprecated (M44) |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 } break; | 534 } break; |
| 526 case TRANSLATE: { | 535 case TRANSLATE: { |
| 527 SkScalar dx = reader->readScalar(); | 536 SkScalar dx = reader->readScalar(); |
| 528 SkScalar dy = reader->readScalar(); | 537 SkScalar dy = reader->readScalar(); |
| 529 canvas->translate(dx, dy); | 538 canvas->translate(dx, dy); |
| 530 } break; | 539 } break; |
| 531 default: | 540 default: |
| 532 SkASSERTF(false, "Unknown draw type: %d", op); | 541 SkASSERTF(false, "Unknown draw type: %d", op); |
| 533 } | 542 } |
| 534 } | 543 } |
| OLD | NEW |