diff options
| author |  rmistry <rmistry@google.com> | 2014-10-17 06:19:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-17 06:19:27 -0700 |
| commit | 6fedd3a4e6f97f4e28946091e204cd8aedbd0b70 (patch) | |
| tree | ca3f1aab2dec14ea9e28d96407e2593e737d09f2 /include | |
| parent | 63a9f842a12c8ce265ca7a8c43117e2e7129ac83 (diff) | |
Revert of Override SkCanvas::drawImage() in SkDeferredCanvas and SkGPipe (patchset #5 id:80001 of https://codereview.chromium.org/613673005/)
Reason for revert:
Trying to fix DEPS roll failure:
https://codereview.chromium.org/660113002/
Link to failing builds:
http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/29578
http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/29354
Original issue's description:
> Override SkCanvas::drawImage() in SkDeferredCanvas and SkGPipe
>
> BUG=skia:2947
>
> Committed: https://skia.googlesource.com/skia/+/687732fe046c9cfec940f2d7f661cd97651d10a8
TBR=junov@chromium.org,reed@google.com,bsalomon@chromium.org,piotaixr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2947
Review URL: https://codereview.chromium.org/658293004
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/SkDeferredCanvas.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h index a1ac295185..5f781f8859 100644 --- a/include/utils/SkDeferredCanvas.h +++ b/include/utils/SkDeferredCanvas.h @@ -164,12 +164,8 @@ public: virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, const SkPaint* paint) SK_OVERRIDE; virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, - const SkRect& dst, const SkPaint* paint) SK_OVERRIDE; - virtual void drawImage(const SkImage* image, SkScalar left, SkScalar top, - const SkPaint* paint) SK_OVERRIDE; - virtual void drawImageRect(const SkImage* image, const SkRect* src, - const SkRect& dst, - const SkPaint* paint) SK_OVERRIDE; + const SkRect& dst, const SkPaint* paint) + SK_OVERRIDE; virtual void drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) SK_OVERRIDE; virtual void drawVertices(VertexMode vmode, int vertexCount, @@ -201,7 +197,7 @@ protected: virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) SK_OVERRIDE; - + virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |