aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkRemote.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-12-18 07:09:18 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-18 07:09:18 -0800
commit4960eeec4a1f2a772654883d7f3615d47bcd5dc3 (patch)
tree755f249521a7cef2b14dcce005c7a1b7ffb7525d /src/core/SkRemote.cpp
parentf97aa74fea0133378e64700e30a7c2962212fcb5 (diff)
change signature for virtual related to saveLayer, passing SaveLayerRec
Diffstat (limited to 'src/core/SkRemote.cpp')
-rw-r--r--src/core/SkRemote.cpp19
1 files changed, 10 insertions, 9 deletions
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);
}