commit 8a33e4019991c58b06adf2e3a9ac1eeeccd8fa94
author Stan Iliev <stani@google.com> Fri Jul 08 09:57:49 2016 -0400
committer Stan Iliev <stani@google.com> Mon Jul 11 12:01:51 2016 -0400
tree a43c168540361b613a28fe5ac096d6d50a6f2852
parent d79f237d63cbf612ad6334c76cf29d88f81c7a8f

Move isSkiaEnabled to the Properties class

Move CanvasContext::isSkiaEnabled to Properties:isSkiaEnabled.

Change-Id: I0a62f43825cf59ba338a24a056e8c2a56d1c5315

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index d36ebc7..f8434a4 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -72,7 +72,7 @@
             //TODO: implement SKIA GL
             LOG_ALWAYS_FATAL("skiaGL canvas type not implemented.");
             break;
-        case RenderPipelineType::Vulkan:
+        case RenderPipelineType::SkiaVulkan:
             //TODO: implement Vulkan
             LOG_ALWAYS_FATAL("Vulkan canvas type not implemented.");
             break;
@@ -693,11 +693,6 @@
     return mFrameNumber;
 }
 
-bool CanvasContext::isSkiaEnabled() {
-    auto renderType = Properties::getRenderPipelineType();
-    return RenderPipelineType::SkiaGL == renderType || RenderPipelineType::Vulkan == renderType;
-}
-
 } /* namespace renderthread */
 } /* namespace uirenderer */
 } /* namespace android */