diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Android.mk | 1 | ||||
| -rw-r--r-- | libs/hwui/DisplayListRenderer.h | 5 | ||||
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/Layer.h | 1 | ||||
| -rw-r--r-- | libs/hwui/font/CacheTexture.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/font/Font.cpp | 1 |
6 files changed, 8 insertions, 2 deletions
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 549edd2..67359ad 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -42,6 +42,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) external/skia/include/core \ external/skia/include/effects \ external/skia/include/images \ + external/skia/src/core \ external/skia/src/ports \ external/skia/include/utils diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h index e42def5..c1f978d 100644 --- a/libs/hwui/DisplayListRenderer.h +++ b/libs/hwui/DisplayListRenderer.h @@ -18,7 +18,8 @@ #define ANDROID_HWUI_DISPLAY_LIST_RENDERER_H #include <SkChunkAlloc.h> -#include <SkFlattenable.h> +#include <SkReader32.h> +#include <SkWriter32.h> #include <SkMatrix.h> #include <SkCamera.h> #include <SkPaint.h> @@ -499,7 +500,7 @@ private: Vector<SkiaShader*> mShaders; Vector<Layer*> mLayers; - mutable SkFlattenableReadBuffer mReader; + mutable SkReader32 mReader; size_t mSize; diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 47784a4..2a09ced 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -16,6 +16,7 @@ #define LOG_TAG "OpenGLRenderer" +#include <SkGlyph.h> #include <SkUtils.h> #include <cutils/properties.h> diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h index 181eb6c..efb9f6b 100644 --- a/libs/hwui/Layer.h +++ b/libs/hwui/Layer.h @@ -23,6 +23,7 @@ #include <ui/Region.h> +#include <SkPaint.h> #include <SkXfermode.h> #include "Rect.h" diff --git a/libs/hwui/font/CacheTexture.cpp b/libs/hwui/font/CacheTexture.cpp index f653592..24b0523 100644 --- a/libs/hwui/font/CacheTexture.cpp +++ b/libs/hwui/font/CacheTexture.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <SkGlyph.h> #include <utils/Log.h> #include "Debug.h" diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index 7bfa63d..9068b8a 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -18,6 +18,7 @@ #include <cutils/compiler.h> +#include <SkGlyph.h> #include <SkUtils.h> #include "Debug.h" |