| commit | dccca44ffda4836b56a21da95a046c9708ffd49c | [log] [tgz] |
|---|---|---|
| author | sergeyv <sergeyv@google.com> | Mon Mar 21 15:38:21 2016 -0700 |
| committer | sergeyv <sergeyv@google.com> | Mon Mar 21 15:55:46 2016 -0700 |
| tree | e4c0bcfeb0f37f0fd6ed4a08d58e701494bc61a8 | |
| parent | c57fc4787f5aadb129686e904b86d343c8ae3541 [diff] |
Reland: Move text logic from jni to hwui level Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/ Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index c539d63..31eec8c 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -19,7 +19,6 @@ #include "AnimationContext.h" #include "Caches.h" -#include "Canvas.h" #include "DeferredLayerUpdater.h" #include "EglManager.h" #include "LayerUpdateQueue.h" @@ -27,6 +26,7 @@ #include "OpenGLRenderer.h" #include "Properties.h" #include "RenderThread.h" +#include "hwui/Canvas.h" #include "renderstate/RenderState.h" #include "renderstate/Stencil.h" #include "protos/hwui.pb.h"