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

remove internalDrawBitmap, as it is no longer shared with any other caller, and can be folded into onDrawBitmap

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1391333004
This commit is contained in:
reed 2015-10-08 09:22:02 -07:00 committed by Commit bot
parent 8585dd26bf
commit 33366974d4
2 changed files with 25 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkCanvas.h
View File

@ -1402,9 +1402,6 @@ private:
SkISize getTopLayerSize() const; SkISize getTopLayerSize() const;
SkIPoint getTopLayerOrigin() const; SkIPoint getTopLayerOrigin() const;
// internal methods are not virtual, so they can safely be called by other
// canvas apis, without confusing subclasses (like SkPictureRecording)
void internalDrawBitmap(const SkBitmap&, const SkMatrix& m, const SkPaint* paint);
void internalDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, void internalDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
const SkRect& dst, const SkPaint* paint, const SkRect& dst, const SkPaint* paint,
SrcRectConstraint); SrcRectConstraint);

65
src/core/SkCanvas.cpp
View File

@ -1285,35 +1285,6 @@ bool SkAutoROCanvasPixels::asROBitmap(SkBitmap* bitmap) const {
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
void SkCanvas::internalDrawBitmap(const SkBitmap& bitmap,
const SkMatrix& matrix, const SkPaint* paint) {
if (bitmap.drawsNothing()) {
return;
}
SkLazyPaint lazy;
if (nullptr == paint) {
paint = lazy.init();
}
SkDEBUGCODE(bitmap.validate();)
SkRect storage;
const SkRect* bounds = nullptr;
if (paint && paint->canComputeFastBounds()) {
bitmap.getBounds(&storage);
matrix.mapRect(&storage);
bounds = &paint->computeFastBounds(storage, &storage);
}
LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
while (iter.next()) {
iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint());
}
LOOPER_END
}
void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y, void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y,
const SkPaint* paint, bool deviceIsBitmapDevice) { const SkPaint* paint, bool deviceIsBitmapDevice) {
@ -2196,23 +2167,35 @@ void SkCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, cons
TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmap()"); TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmap()");
SkDEBUGCODE(bitmap.validate();) SkDEBUGCODE(bitmap.validate();)
if (nullptr == paint || paint->canComputeFastBounds()) { if (bitmap.drawsNothing()) {
SkRect bounds = { return;
x, y,
x + SkIntToScalar(bitmap.width()),
y + SkIntToScalar(bitmap.height())
};
if (paint) {
(void)paint->computeFastBounds(bounds, &bounds);
} }
if (this->quickReject(bounds)) {
SkLazyPaint lazy;
if (nullptr == paint) {
paint = lazy.init();
}
const SkMatrix matrix = SkMatrix::MakeTrans(x, y);
SkRect storage;
const SkRect* bounds = nullptr;
if (paint->canComputeFastBounds()) {
bitmap.getBounds(&storage);
matrix.mapRect(&storage);
bounds = &paint->computeFastBounds(storage, &storage);
if (this->quickReject(*bounds)) {
return; return;
} }
} }
SkMatrix matrix; LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
matrix.setTranslate(x, y);
this->internalDrawBitmap(bitmap, matrix, paint); while (iter.next()) {
iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint());
}
LOOPER_END
} }
// this one is non-virtual, so it can be called safely by other canvas apis // this one is non-virtual, so it can be called safely by other canvas apis