From 4960eeec4a1f2a772654883d7f3615d47bcd5dc3 Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 18 Dec 2015 07:09:18 -0800 Subject: change signature for virtual related to saveLayer, passing SaveLayerRec BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1533953002 NOTREECHECKS=True Review URL: https://codereview.chromium.org/1533953002 --- src/core/SkRemote.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/core/SkRemote.cpp') diff --git a/src/core/SkRemote.cpp b/src/core/SkRemote.cpp index 1209be014c..22185cddb0 100644 --- a/src/core/SkRemote.cpp +++ b/src/core/SkRemote.cpp @@ -163,18 +163,17 @@ namespace SkRemote { void willSave() override { fEncoder-> save(); } void didRestore() override { fEncoder->restore(); } - SaveLayerStrategy willSaveLayer(const SkRect* bounds, - const SkPaint* paint, - SaveFlags flags) override { + SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override { SkPath path; - if (bounds) { - path.addRect(*bounds); + if (rec.fBounds) { + path.addRect(*rec.fBounds); } const SkPaint defaultPaint; + const SkPaint* paint = rec.fPaint; if (!paint) { paint = &defaultPaint; } - fEncoder->saveLayer(this->id(path), this->commonIDs(*paint), flags); + fEncoder->saveLayer(this->id(path), this->commonIDs(*paint), rec.fSaveLayerFlags); return kNoLayer_SaveLayerStrategy; } @@ -500,11 +499,13 @@ namespace SkRemote { void save() override { fCanvas->save(); } void restore() override { fCanvas->restore(); } - void saveLayer(ID bounds, CommonIDs common, SkCanvas::SaveFlags flags) override { + void saveLayer(ID bounds, CommonIDs common, SkCanvas::SaveLayerFlags flags) override { SkPaint paint; this->applyCommon(common, &paint); SkRect rect; - fCanvas->saveLayer(fPath.find(bounds).isRect(&rect) ? &rect : nullptr, &paint, flags); + + fCanvas->saveLayer({ fPath.find(bounds).isRect(&rect) ? &rect : nullptr, + &paint, flags }); } void setMatrix(ID matrix) override { fCanvas->setMatrix(fMatrix.find(matrix)); } @@ -684,7 +685,7 @@ namespace SkRemote { void save() override { fWrapped-> save(); } void restore() override { fWrapped->restore(); } - void saveLayer(ID bounds, CommonIDs common, SkCanvas::SaveFlags flags) override { + void saveLayer(ID bounds, CommonIDs common, SkCanvas::SaveLayerFlags flags) override { fWrapped->saveLayer(bounds, common, flags); } -- cgit v1.2.3