AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make some canvas utils virtual (for proxy based subclasses)

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2130973002

Review-Url: https://codereview.chromium.org/2130973002
This commit is contained in:
reed 2016-07-07 16:44:27 -07:00 committed by Commit bot
parent 63f30d9049
commit ea5a6513c0
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkCanvas.h
View File

@ -1297,6 +1297,9 @@ protected:
// default impl defers to its device // default impl defers to its device
virtual bool onPeekPixels(SkPixmap*); virtual bool onPeekPixels(SkPixmap*);
virtual bool onAccessTopLayerPixels(SkPixmap*); virtual bool onAccessTopLayerPixels(SkPixmap*);
virtual SkImageInfo onImageInfo() const;
virtual bool onGetProps(SkSurfaceProps*) const;
virtual void onFlush();
// Subclass save/restore notifiers. // Subclass save/restore notifiers.
// Overriders should call the corresponding INHERITED method up the inheritance chain. // Overriders should call the corresponding INHERITED method up the inheritance chain.

18
src/core/SkCanvas.cpp
View File

@ -812,6 +812,10 @@ SkMetaData& SkCanvas::getMetaData() {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
void SkCanvas::flush() { void SkCanvas::flush() {
this->onFlush();
}
void SkCanvas::onFlush() {
SkBaseDevice* device = this->getDevice(); SkBaseDevice* device = this->getDevice();
if (device) { if (device) {
device->flush(); device->flush();
@ -1371,6 +1375,10 @@ sk_sp<SkSurface> SkCanvas::onNewSurface(const SkImageInfo& info, const SkSurface
} }
SkImageInfo SkCanvas::imageInfo() const { SkImageInfo SkCanvas::imageInfo() const {
return this->onImageInfo();
}
SkImageInfo SkCanvas::onImageInfo() const {
SkBaseDevice* dev = this->getDevice(); SkBaseDevice* dev = this->getDevice();
if (dev) { if (dev) {
return dev->imageInfo(); return dev->imageInfo();
@ -1380,6 +1388,10 @@ SkImageInfo SkCanvas::imageInfo() const {
} }
bool SkCanvas::getProps(SkSurfaceProps* props) const { bool SkCanvas::getProps(SkSurfaceProps* props) const {
return this->onGetProps(props);
}
bool SkCanvas::onGetProps(SkSurfaceProps* props) const {
SkBaseDevice* dev = this->getDevice(); SkBaseDevice* dev = this->getDevice();
if (dev) { if (dev) {
if (props) { if (props) {
@ -2916,12 +2928,6 @@ void SkCanvas::drawRoundRect(const SkRect& r, SkScalar rx, SkScalar ry,
const SkPaint& paint) { const SkPaint& paint) {
TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRoundRect()"); TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRoundRect()");
if (rx > 0 && ry > 0) { if (rx > 0 && ry > 0) {
if (paint.canComputeFastBounds()) {
SkRect storage;
if (this->quickReject(paint.computeFastBounds(r, &storage))) {
return;
}
}
SkRRect rrect; SkRRect rrect;
rrect.setRectXY(r, rx, ry); rrect.setRectXY(r, rx, ry);
this->drawRRect(rrect, paint); this->drawRRect(rrect, paint);