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

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

Issue 1533953002: change signature for virtual related to saveLayer, passing SaveLayerRec (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update comment Created 5 years 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 | « src/core/SkPictureFlat.h ('k') | src/core/SkPictureRecord.h » ('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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 canvas->rotate(reader->readScalar()); 448 canvas->rotate(reader->readScalar());
449 break; 449 break;
450 case SAVE: 450 case SAVE:
451 // SKPs with version < 29 also store a SaveFlags param. 451 // SKPs with version < 29 also store a SaveFlags param.
452 if (size > 4) { 452 if (size > 4) {
453 SkASSERT(8 == size); 453 SkASSERT(8 == size);
454 reader->readInt(); 454 reader->readInt();
455 } 455 }
456 canvas->save(); 456 canvas->save();
457 break; 457 break;
458 case SAVE_LAYER: { 458 case SAVE_LAYER_SAVEFLAGS_DEPRECATED: {
459 const SkRect* boundsPtr = get_rect_ptr(reader); 459 const SkRect* boundsPtr = get_rect_ptr(reader);
460 const SkPaint* paint = fPictureData->getPaint(reader); 460 const SkPaint* paint = fPictureData->getPaint(reader);
461 canvas->saveLayer(boundsPtr, paint, (SkCanvas::SaveFlags) reader->re adInt()); 461 const SkCanvas::SaveFlags flags = (SkCanvas::SaveFlags)reader->readI nt();
462 canvas->saveLayer(SkCanvas::SaveLayerRec(boundsPtr, paint,
463 SkCanvas::SaveFlagsToSaveLayerFlags(f lags)));
464 } break;
465 case SAVE_LAYER_SAVELAYERFLAGS: {
466 const SkRect* boundsPtr = get_rect_ptr(reader);
467 const SkPaint* paint = fPictureData->getPaint(reader);
468 canvas->saveLayer(SkCanvas::SaveLayerRec(boundsPtr, paint, reader->r eadInt()));
462 } break; 469 } break;
463 case SCALE: { 470 case SCALE: {
464 SkScalar sx = reader->readScalar(); 471 SkScalar sx = reader->readScalar();
465 SkScalar sy = reader->readScalar(); 472 SkScalar sy = reader->readScalar();
466 canvas->scale(sx, sy); 473 canvas->scale(sx, sy);
467 } break; 474 } break;
468 case SET_MATRIX: { 475 case SET_MATRIX: {
469 SkMatrix matrix; 476 SkMatrix matrix;
470 reader->readMatrix(&matrix); 477 reader->readMatrix(&matrix);
471 matrix.postConcat(initialMatrix); 478 matrix.postConcat(initialMatrix);
472 canvas->setMatrix(matrix); 479 canvas->setMatrix(matrix);
473 } break; 480 } break;
474 case SKEW: { 481 case SKEW: {
475 SkScalar sx = reader->readScalar(); 482 SkScalar sx = reader->readScalar();
476 SkScalar sy = reader->readScalar(); 483 SkScalar sy = reader->readScalar();
477 canvas->skew(sx, sy); 484 canvas->skew(sx, sy);
478 } break; 485 } break;
479 case TRANSLATE: { 486 case TRANSLATE: {
480 SkScalar dx = reader->readScalar(); 487 SkScalar dx = reader->readScalar();
481 SkScalar dy = reader->readScalar(); 488 SkScalar dy = reader->readScalar();
482 canvas->translate(dx, dy); 489 canvas->translate(dx, dy);
483 } break; 490 } break;
484 default: 491 default:
485 SkASSERTF(false, "Unknown draw type: %d", op); 492 SkASSERTF(false, "Unknown draw type: %d", op);
486 } 493 }
487 } 494 }
488 495
OLDNEW
« no previous file with comments | « src/core/SkPictureFlat.h ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698