diff options
| author | fmalita@chromium.org <fmalita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 14:39:18 +0000 |
|---|---|---|
| committer | fmalita@chromium.org <fmalita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 14:39:18 +0000 |
| commit | 33d0dcaaf5975f5ed01a1e44e79a4fe4d15ae6a6 (patch) | |
| tree | 38fffa67c651610945111ec1e2f188b724c471a9 /skia | |
| parent | 6937094bf523039da6dd4976205949e670c34967 (diff) | |
| download | chromium_src-33d0dcaaf5975f5ed01a1e44e79a4fe4d15ae6a6.zip chromium_src-33d0dcaaf5975f5ed01a1e44e79a4fe4d15ae6a6.tar.gz chromium_src-33d0dcaaf5975f5ed01a1e44e79a4fe4d15ae6a6.tar.bz2 | |
Switch to the new SkCanvas::willSave() API.
Skia's save() SaveFlags bits are deprecated. At this
point all callers have been updated to always pass kMatrixClip, but
SkCanvas subclasses also need to use the new willSave() API.
(depends on https://codereview.chromium.org/338833003/ rolling)
BUG=skia:2297
R=piman@chromium.org, reed@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/337163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/analysis_canvas.cc | 4 | ||||
| -rw-r--r-- | skia/ext/analysis_canvas.h | 2 | ||||
| -rw-r--r-- | skia/ext/benchmarking_canvas.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc index a276814..16a7ffa 100644 --- a/skia/ext/analysis_canvas.cc +++ b/skia/ext/analysis_canvas.cc @@ -354,9 +354,9 @@ void AnalysisCanvas::onClipRRect(const SkRRect& rrect, INHERITED::onClipRect(rrect.getBounds(), op, edge_style); } -void AnalysisCanvas::willSave(SkCanvas::SaveFlags flags) { +void AnalysisCanvas::willSave() { ++saved_stack_size_; - INHERITED::willSave(flags); + INHERITED::willSave(); } SkCanvas::SaveLayerStrategy AnalysisCanvas::willSaveLayer( diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h index 29a360d..b3e5275 100644 --- a/skia/ext/analysis_canvas.h +++ b/skia/ext/analysis_canvas.h @@ -70,7 +70,7 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { const SkPaint&) OVERRIDE; protected: - virtual void willSave(SaveFlags) OVERRIDE; + virtual void willSave() OVERRIDE; virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) OVERRIDE; diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc index fd5e574..b0a3082 100644 --- a/skia/ext/benchmarking_canvas.cc +++ b/skia/ext/benchmarking_canvas.cc @@ -40,9 +40,9 @@ public: } // SkCanvas overrides. - virtual void willSave(SaveFlags flags) OVERRIDE { + virtual void willSave() OVERRIDE { AutoStamper stamper(this); - SkProxyCanvas::willSave(flags); + SkProxyCanvas::willSave(); } virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, |