commit d8f904f256b82e48e9a85561eb96e15399b0b2d9
author Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
committer Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
tree 6f418fc8ec95ab0112a39adbd7fa3bfff0d2ca4d
parent 550780745fa28ae9a87d02331841ca5ce4f9c763

Revert "Merge six commits from master-skia to master"

This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989

libs/hwui/SkiaCanvasProxy.h

diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h
index 2fe4327..0de9650 100644
--- a/libs/hwui/SkiaCanvasProxy.h
+++ b/libs/hwui/SkiaCanvasProxy.h
@@ -63,7 +63,7 @@
     virtual void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top,
                               const SkPaint*) override;
     virtual void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst,
-                                  const SkPaint* paint, SrcRectConstraint) override;
+                                  const SkPaint* paint, DrawBitmapRectFlags flags) override;
     virtual void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
                                   const SkRect& dst, const SkPaint*) override;
     virtual void onDrawSprite(const SkBitmap&, int left, int top,