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

Unified Diff: src/core/SkMatrixClipStateMgr.h

Issue 340403003: SaveFlags be-gone (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: One more baseurl attempt Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkCanvas.cpp ('k') | src/core/SkMatrixClipStateMgr.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkMatrixClipStateMgr.h
diff --git a/src/core/SkMatrixClipStateMgr.h b/src/core/SkMatrixClipStateMgr.h
index 016baa008a6cc0abb7ff3b1fa6d4db4bddc37c2e..9a80b0154e14e35bb4ef79c1e2cbe7d58f7b0eef 100644
--- a/src/core/SkMatrixClipStateMgr.h
+++ b/src/core/SkMatrixClipStateMgr.h
@@ -181,7 +181,7 @@ public:
typedef SkNoncopyable INHERITED;
};
- MatrixClipState(MatrixClipState* prev, int flags)
+ MatrixClipState(MatrixClipState* prev)
: fPrev(prev)
{
fHasOpen = false;
@@ -202,19 +202,11 @@ public:
else {
fLayerID = prev->fLayerID;
- if (flags & SkCanvas::kMatrix_SaveFlag) {
- fMatrixInfoStorage = *prev->fMatrixInfo;
- fMatrixInfo = &fMatrixInfoStorage;
- } else {
- fMatrixInfo = prev->fMatrixInfo;
- }
+ fMatrixInfoStorage = *prev->fMatrixInfo;
+ fMatrixInfo = &fMatrixInfoStorage;
- if (flags & SkCanvas::kClip_SaveFlag) {
- // We don't copy the ClipOps of the previous clip states
- fClipInfo = &fClipInfoStorage;
- } else {
- fClipInfo = prev->fClipInfo;
- }
+ // We don't copy the ClipOps of the previous clip states
+ fClipInfo = &fClipInfoStorage;
// Initially a new save/saveLayer represents the same MC state
// as its predecessor.
@@ -275,7 +267,7 @@ public:
// this duplicates effort.
int getSaveCount() const { return fMatrixClipStack.count(); }
- int save(SkCanvas::SaveFlags flags);
+ int save();
int saveLayer(const SkRect* bounds, const SkPaint* paint, SkCanvas::SaveFlags flags);
@@ -372,7 +364,7 @@ protected:
SkDEBUGCODE(void validate();)
- int MCStackPush(SkCanvas::SaveFlags flags);
+ int MCStackPush();
void addClipOffset(size_t offset) {
SkASSERT(NULL != fSkipOffsets);
« no previous file with comments | « src/core/SkCanvas.cpp ('k') | src/core/SkMatrixClipStateMgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698