diff options
| author | Derek Sollenberger <djsollen@google.com> | 2013-12-10 12:28:58 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2014-02-07 17:06:14 -0500 |
| commit | 76d3a1b8d035d27bc80b0f2fc480a903bd001514 (patch) | |
| tree | a6346bbf593d565d89990f0bddecd2a5df92de9d /libs/hwui/Layer.h | |
| parent | 8852ab4357ffb653bafb36f3b9272866834f7a72 (diff) | |
Removing SkiaColorFilter and inspecting the native object directly.
bug: 10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
Diffstat (limited to 'libs/hwui/Layer.h')
| -rw-r--r-- | libs/hwui/Layer.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h index 471a4a6084c1..ec80e9c02d3d 100644 --- a/libs/hwui/Layer.h +++ b/libs/hwui/Layer.h @@ -17,6 +17,7 @@ #ifndef ANDROID_HWUI_LAYER_H #define ANDROID_HWUI_LAYER_H +#include <cutils/compiler.h> #include <sys/types.h> #include <GLES2/gl2.h> @@ -26,9 +27,9 @@ #include <SkPaint.h> #include <SkXfermode.h> +#include "Matrix.h" #include "Rect.h" #include "RenderBuffer.h" -#include "SkiaColorFilter.h" #include "Texture.h" #include "Vertex.h" @@ -217,11 +218,11 @@ public: this->textureLayer = textureLayer; } - inline SkiaColorFilter* getColorFilter() const { + inline SkColorFilter* getColorFilter() const { return colorFilter; } - ANDROID_API void setColorFilter(SkiaColorFilter* filter); + ANDROID_API void setColorFilter(SkColorFilter* filter); void bindStencilRenderBuffer() const; @@ -339,7 +340,7 @@ private: /** * Color filter used to draw this layer. Optional. */ - SkiaColorFilter* colorFilter; + SkColorFilter* colorFilter; /** * Opacity of the layer. |