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

Fix straggling SK_VIRTUAL_CONSTRAINT_TYPEs

Browse Source 
These were removed with crrev.com/1239193002, but a few were missed
in files that are only build on Android framework.

Brings the Android build one step closer to building.

Review URL: https://codereview.chromium.org/1268603003
This commit is contained in:
scroggo 2015-07-31 14:29:26 -07:00 committed by Commit bot
parent da9ccf1754
commit aa80e425d8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/android/SkAndroidSDKCanvas.cpp
View File

@ -143,10 +143,9 @@ void SkAndroidSDKCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
const SkRect* src, const SkRect* src,
const SkRect& dst, const SkRect& dst,
const SkPaint* paint, const SkPaint* paint,
SK_VIRTUAL_CONSTRAINT_TYPE constraint) { SkCanvas::SrcRectConstraint constraint) {
FILTER_PTR(paint); FILTER_PTR(paint);
fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint, fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint, constraint);
(SrcRectConstraint)constraint);
} }
void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap, void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
const SkIRect& center, const SkIRect& center,

2
src/utils/android/SkAndroidSDKCanvas.h
View File

@ -43,7 +43,7 @@ protected:
void onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, void onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
const SkPaint* paint) override; const SkPaint* paint) override;
void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
const SkPaint* paint, SK_VIRTUAL_CONSTRAINT_TYPE) override; const SkPaint* paint, SkCanvas::SrcRectConstraint) override;
void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint) override; const SkRect& dst, const SkPaint* paint) override;
void onDrawSprite(const SkBitmap& bitmap, int left, int top, void onDrawSprite(const SkBitmap& bitmap, int left, int top,