diff options
| author | 2014-06-27 07:21:36 -0700 | |
|---|---|---|
| committer | 2014-06-27 19:25:16 +0000 | |
| commit | ca1b3b83bb4289315e25520364182ebad951ba08 (patch) | |
| tree | f65720a5740e3a2666ea2ccc34d0b255c2453f59 | |
| parent | bc5ddd69dd1a0771f02409e96476ea8ebe89debb (diff) | |
Cleanup
Change-Id: I8a75e6e32a4cb02e3978503305b4cdce1727e89a
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 4 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 5ed04a074a1e..9fb972b47894 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -253,7 +253,7 @@ public: // default empty constructor for bounds, to be overridden in child constructor body DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { } - bool getLocalBounds(Rect& localBounds) { + virtual bool getLocalBounds(Rect& localBounds) { localBounds.set(mLocalBounds); OpenGLRenderer::TextShadow textShadow; if (OpenGLRenderer::getTextShadow(mPaint, &textShadow)) { @@ -1029,7 +1029,7 @@ public: DrawStrokableOp(float left, float top, float right, float bottom, const SkPaint* paint) : DrawBoundedOp(left, top, right, bottom, paint) {}; - bool getLocalBounds(Rect& localBounds) { + virtual bool getLocalBounds(Rect& localBounds) { localBounds.set(mLocalBounds); if (mPaint && mPaint->getStyle() != SkPaint::kFill_Style) { localBounds.outset(strokeWidthOutset()); diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 4ff578003441..8a1aebc890e7 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -184,12 +184,6 @@ public: virtual status_t drawRoundRect(float left, float top, float right, float bottom, float rx, float ry, const SkPaint* paint); virtual status_t drawCircle(float x, float y, float radius, const SkPaint* paint); - virtual status_t drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y, - CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint) { - // TODO: Remove once android_view_GLES20Canvas uses DisplayListRenderer - // directly - return drawCircle(x->value, y->value, radius->value, &paint->value); - } virtual status_t drawOval(float left, float top, float right, float bottom, const SkPaint* paint); virtual status_t drawArc(float left, float top, float right, float bottom, |