diff options
| author | John Reck <jreck@google.com> | 2015-07-30 17:38:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-30 17:38:35 +0000 |
| commit | cef25e5319e4f76682dd63a3c01bfacb19aeeb51 (patch) | |
| tree | 9504d6b0708f8e3c06158ef597efded8dc93bfaf /libs/hwui/OpenGLRenderer.h | |
| parent | ba36e0c2d1f6377671b493a5ae121140c002ce0f (diff) | |
| parent | 272a685f17cc4828257e521a6f62b7b17870f75e (diff) | |
Merge "Replace most usages of utils/Vector.h"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.h')
| -rwxr-xr-x | libs/hwui/OpenGLRenderer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 402f6edd475d..390f6207f4ea 100755 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -44,12 +44,13 @@ #include <utils/Functor.h> #include <utils/RefBase.h> #include <utils/SortedVector.h> -#include <utils/Vector.h> #include <cutils/compiler.h> #include <androidfw/ResourceTypes.h> +#include <vector> + class SkShader; namespace android { @@ -855,7 +856,7 @@ private: // List of rectangles to clear after saveLayer() is invoked std::vector<Rect> mLayers; // List of layers to update at the beginning of a frame - Vector< sp<Layer> > mLayerUpdates; + std::vector< sp<Layer> > mLayerUpdates; // See PROPERTY_DISABLE_SCISSOR_OPTIMIZATION in // Properties.h |