summaryrefslogtreecommitdiffstats
path: root/libs/hwui/Canvas.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-04-22 09:04:45 -0700
committerJohn Reck <jreck@google.com>2015-04-22 09:34:34 -0700
commitc1b33d665c8caf5760f68c45c6ca0baa649b832a (patch)
tree9c89975587ac76b4d10589fdc15d7af4baa22dbf /libs/hwui/Canvas.h
parentbb2979d61c9cabd6f0476cc9e2121616d8001567 (diff)
downloadframeworks_base-c1b33d665c8caf5760f68c45c6ca0baa649b832a.zip
frameworks_base-c1b33d665c8caf5760f68c45c6ca0baa649b832a.tar.gz
frameworks_base-c1b33d665c8caf5760f68c45c6ca0baa649b832a.tar.bz2
GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
Diffstat (limited to 'libs/hwui/Canvas.h')
-rw-r--r--libs/hwui/Canvas.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/Canvas.h b/libs/hwui/Canvas.h
index 7ad0683..aa24673 100644
--- a/libs/hwui/Canvas.h
+++ b/libs/hwui/Canvas.h
@@ -29,7 +29,7 @@ class ANDROID_API Canvas {
public:
virtual ~Canvas() {};
- static Canvas* create_canvas(SkBitmap* bitmap);
+ static Canvas* create_canvas(const SkBitmap& bitmap);
/**
* Create a new Canvas object which delegates to an SkCanvas.
@@ -52,7 +52,7 @@ public:
*/
virtual SkCanvas* asSkCanvas() = 0;
- virtual void setBitmap(SkBitmap* bitmap, bool copyState) = 0;
+ virtual void setBitmap(const SkBitmap& bitmap) = 0;
virtual bool isOpaque() = 0;
virtual int width() = 0;
@@ -87,7 +87,8 @@ public:
virtual bool quickRejectRect(float left, float top, float right, float bottom) const = 0;
virtual bool quickRejectPath(const SkPath& path) const = 0;
- virtual bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op) = 0;
+ virtual bool clipRect(float left, float top, float right, float bottom,
+ SkRegion::Op op = SkRegion::kIntersect_Op) = 0;
virtual bool clipPath(const SkPath* path, SkRegion::Op op) = 0;
virtual bool clipRegion(const SkRegion* region, SkRegion::Op op) = 0;