Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/core/SkPicturePlayback.cpp

Issue 467683003: Add missing DRAW_PICTURE_MATRIX_PAINT paint offset. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: New order: paint->matrix->picture Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/core/SkPictureRecord.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 canvas->drawPatch(cubics, colors, texCoords, xfer, paint); 333 canvas->drawPatch(cubics, colors, texCoords, xfer, paint);
334 } break; 334 } break;
335 case DRAW_PATH: { 335 case DRAW_PATH: {
336 const SkPaint& paint = *fPictureData->getPaint(reader); 336 const SkPaint& paint = *fPictureData->getPaint(reader);
337 canvas->drawPath(fPictureData->getPath(reader), paint); 337 canvas->drawPath(fPictureData->getPath(reader), paint);
338 } break; 338 } break;
339 case DRAW_PICTURE: 339 case DRAW_PICTURE:
340 canvas->drawPicture(fPictureData->getPicture(reader)); 340 canvas->drawPicture(fPictureData->getPicture(reader));
341 break; 341 break;
342 case DRAW_PICTURE_MATRIX_PAINT: { 342 case DRAW_PICTURE_MATRIX_PAINT: {
343 const SkPicture* pic = fPictureData->getPicture(reader); 343 const SkPaint* paint = fPictureData->getPaint(reader);
344 SkMatrix matrix; 344 SkMatrix matrix;
345 reader->readMatrix(&matrix); 345 reader->readMatrix(&matrix);
346 const SkPaint* paint = fPictureData->getPaint(reader); 346 const SkPicture* pic = fPictureData->getPicture(reader);
347 canvas->drawPicture(pic, &matrix, paint); 347 canvas->drawPicture(pic, &matrix, paint);
348 } break; 348 } break;
349 case DRAW_POINTS: { 349 case DRAW_POINTS: {
350 const SkPaint& paint = *fPictureData->getPaint(reader); 350 const SkPaint& paint = *fPictureData->getPaint(reader);
351 SkCanvas::PointMode mode = (SkCanvas::PointMode)reader->readInt(); 351 SkCanvas::PointMode mode = (SkCanvas::PointMode)reader->readInt();
352 size_t count = reader->readInt(); 352 size_t count = reader->readInt();
353 const SkPoint* pts = (const SkPoint*)reader->skip(sizeof(SkPoint)* c ount); 353 const SkPoint* pts = (const SkPoint*)reader->skip(sizeof(SkPoint)* c ount);
354 canvas->drawPoints(mode, count, pts, paint); 354 canvas->drawPoints(mode, count, pts, paint);
355 } break; 355 } break;
356 case DRAW_POS_TEXT: { 356 case DRAW_POS_TEXT: {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 case TRANSLATE: { 510 case TRANSLATE: {
511 SkScalar dx = reader->readScalar(); 511 SkScalar dx = reader->readScalar();
512 SkScalar dy = reader->readScalar(); 512 SkScalar dy = reader->readScalar();
513 canvas->translate(dx, dy); 513 canvas->translate(dx, dy);
514 } break; 514 } break;
515 default: 515 default:
516 SkASSERT(0); 516 SkASSERT(0);
517 } 517 }
518 } 518 }
519 519
OLDNEW
« no previous file with comments | « no previous file | src/core/SkPictureRecord.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698