diff options
author | 2016-07-07 16:44:27 -0700 | |
---|---|---|
committer | 2016-07-07 16:44:27 -0700 | |
commit | ea5a6513c05e3d7261b68c3ef7d42645ee5bfe17 (patch) | |
tree | 4746ec6f09002a6b59cdc77a7d239c43edf38024 /src | |
parent | 63f30d90498ca1a48868421b528036f3be30e2ad (diff) |
make some canvas utils virtual (for proxy based subclasses)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2130973002
Review-Url: https://codereview.chromium.org/2130973002
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkCanvas.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 733ff19f91..0ce97fff20 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -812,6 +812,10 @@ SkMetaData& SkCanvas::getMetaData() { /////////////////////////////////////////////////////////////////////////////// void SkCanvas::flush() { + this->onFlush(); +} + +void SkCanvas::onFlush() { SkBaseDevice* device = this->getDevice(); if (device) { device->flush(); @@ -1371,6 +1375,10 @@ sk_sp<SkSurface> SkCanvas::onNewSurface(const SkImageInfo& info, const SkSurface } SkImageInfo SkCanvas::imageInfo() const { + return this->onImageInfo(); +} + +SkImageInfo SkCanvas::onImageInfo() const { SkBaseDevice* dev = this->getDevice(); if (dev) { return dev->imageInfo(); @@ -1380,6 +1388,10 @@ SkImageInfo SkCanvas::imageInfo() const { } bool SkCanvas::getProps(SkSurfaceProps* props) const { + return this->onGetProps(props); +} + +bool SkCanvas::onGetProps(SkSurfaceProps* props) const { SkBaseDevice* dev = this->getDevice(); if (dev) { if (props) { @@ -2916,12 +2928,6 @@ void SkCanvas::drawRoundRect(const SkRect& r, SkScalar rx, SkScalar ry, const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRoundRect()"); if (rx > 0 && ry > 0) { - if (paint.canComputeFastBounds()) { - SkRect storage; - if (this->quickReject(paint.computeFastBounds(r, &storage))) { - return; - } - } SkRRect rrect; rrect.setRectXY(r, rx, ry); this->drawRRect(rrect, paint); |