From 03ae272459869b854e5db252fc81a64a516e111f Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 25 Feb 2015 11:01:09 -0800 Subject: Remove renderer abstract class No longer needed, allowing vast majority of methods on OpenGLRenderer to be non-virtual. Change-Id: I8a6ee042b95050dc666887579ef4e1c7a8f9b33b --- libs/hwui/OpenGLRenderer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/hwui/OpenGLRenderer.cpp') diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 161da87ef7e9..2bca9fac4096 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2874,7 +2874,7 @@ void OpenGLRenderer::drawText(const char* text, int bytesCount, int count, float const float* positions, const SkPaint* paint, float totalAdvance, const Rect& bounds, DrawOpMode drawOpMode) { - if (drawOpMode == kDrawOpMode_Immediate) { + if (drawOpMode == DrawOpMode::kImmediate) { // The checks for corner-case ignorable text and quick rejection is only done for immediate // drawing as ops from DeferredDisplayList are already filtered for these if (text == nullptr || count == 0 || mState.currentlyIgnored() || canSkipText(paint) || @@ -2934,7 +2934,7 @@ void OpenGLRenderer::drawText(const char* text, int bytesCount, int count, float TextSetupFunctor functor(this, x, y, pureTranslate, alpha, mode, paint); // don't call issuedrawcommand, do it at end of batch - bool forceFinish = (drawOpMode != kDrawOpMode_Defer); + bool forceFinish = (drawOpMode != DrawOpMode::kDefer); if (CC_UNLIKELY(paint->getTextAlign() != SkPaint::kLeft_Align)) { SkPaint paintCopy(*paint); paintCopy.setTextAlign(SkPaint::kLeft_Align); @@ -2945,7 +2945,7 @@ void OpenGLRenderer::drawText(const char* text, int bytesCount, int count, float positions, hasActiveLayer ? &layerBounds : nullptr, &functor, forceFinish); } - if ((status || drawOpMode != kDrawOpMode_Immediate) && hasActiveLayer) { + if ((status || drawOpMode != DrawOpMode::kImmediate) && hasActiveLayer) { if (!pureTranslate) { transform.mapRect(layerBounds); } -- cgit v1.2.3-59-g8ed1b