diff options
author | Mike Reed <reed@google.com> | 2017-02-22 13:21:42 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-22 19:41:04 +0000 |
commit | 3661bc997620899695041010a750d11dbe8a972d (patch) | |
tree | a3607cc09eaefdc85b6f3d511b8f9632b680dd95 /samplecode | |
parent | 2b767361de00fd85cb32dce62c4a95d30b7eaabf (diff) |
hide trivial helpers on canvas
BUG=skia:
Change-Id: I42d4ca92897bde5bd8e0575a0104b12b83134cef
Reviewed-on: https://skia-review.googlesource.com/8852
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleChart.cpp | 4 | ||||
-rw-r--r-- | samplecode/SampleClipDrawMatch.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleManyRects.cpp | 2 | ||||
-rw-r--r-- | samplecode/SamplePolyToPoly.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleShaders.cpp | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/samplecode/SampleChart.cpp b/samplecode/SampleChart.cpp index 0c8949c8ef..46ce7d3904 100644 --- a/samplecode/SampleChart.cpp +++ b/samplecode/SampleChart.cpp @@ -99,8 +99,8 @@ protected: void onDrawContent(SkCanvas* canvas) override { bool sizeChanged = false; - if (canvas->getDeviceSize() != fSize) { - fSize = canvas->getDeviceSize(); + if (canvas->getBaseLayerSize() != fSize) { + fSize = canvas->getBaseLayerSize(); sizeChanged = true; } diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp index ea30cc6094..b2158a6c86 100644 --- a/samplecode/SampleClipDrawMatch.cpp +++ b/samplecode/SampleClipDrawMatch.cpp @@ -204,7 +204,7 @@ protected: } break; } - SkISize size = canvas->getDeviceSize(); + SkISize size = canvas->getBaseLayerSize(); SkRect bigR = SkRect::MakeWH(SkIntToScalar(size.width()), SkIntToScalar(size.height())); SkPaint p; diff --git a/samplecode/SampleManyRects.cpp b/samplecode/SampleManyRects.cpp index 66274a483a..cb19595fe4 100644 --- a/samplecode/SampleManyRects.cpp +++ b/samplecode/SampleManyRects.cpp @@ -33,7 +33,7 @@ protected: } void onDrawContent(SkCanvas* canvas) override { - SkISize dsize = canvas->getDeviceSize(); + SkISize dsize = canvas->getBaseLayerSize(); canvas->clear(0xFFF0E0F0); for (int i = 0; i < N; ++i) { diff --git a/samplecode/SamplePolyToPoly.cpp b/samplecode/SamplePolyToPoly.cpp index 6cb818a165..8594c2b88f 100644 --- a/samplecode/SamplePolyToPoly.cpp +++ b/samplecode/SamplePolyToPoly.cpp @@ -98,7 +98,7 @@ protected: paint->setColor(SK_ColorGRAY); paint->setStyle(SkPaint::kStroke_Style); const SkScalar D = SkIntToScalar(64); - canvas->drawRectCoords(0, 0, D, D, *paint); + canvas->drawRect(SkRect::MakeWH(D, D), *paint); canvas->drawLine(0, 0, D, D, *paint); canvas->drawLine(0, D, D, 0, *paint); diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp index f9926ebf3f..7ca74ccdb2 100644 --- a/samplecode/SampleShaders.cpp +++ b/samplecode/SampleShaders.cpp @@ -76,15 +76,15 @@ protected: void onDrawContent(SkCanvas* canvas) override { canvas->drawBitmap(fBitmap, 0, 0); - canvas->translate(SkIntToScalar(20), SkIntToScalar(120)); + canvas->translate(20, 120); SkPaint paint; SkRect r; paint.setColor(SK_ColorGREEN); - canvas->drawRectCoords(0, 0, SkIntToScalar(100), SkIntToScalar(100), paint); + canvas->drawRect(SkRect::MakeWH(100, 100), paint); paint.setShader(fShader); - canvas->drawRectCoords(0, 0, SkIntToScalar(100), SkIntToScalar(100), paint); + canvas->drawRect(SkRect::MakeWH(100, 100), paint); canvas->translate(SkIntToScalar(110), 0); |