Merge "Fix warnings in hwui"

libs/hwui/DisplayList.cpp

@@ -567,7 +567,7 @@ void DisplayList::iterateProjectedChildren(OpenGLRenderer& renderer, T& handler,
 template <class T>
 void DisplayList::iterate(OpenGLRenderer& renderer, T& handler, const int level) {
     if (CC_UNLIKELY(mDestroyed)) { // temporary debug logging
-        ALOGW("Error: %s is drawing after destruction, size %d", getName());
+        ALOGW("Error: %s is drawing after destruction", getName());
         CRASH();
     }
     if (mDisplayListData->isEmpty() || mAlpha <= 0) {

libs/hwui/DisplayListRenderer.cpp

@@ -32,9 +32,9 @@ namespace android {
 namespace uirenderer {
 
 DisplayListRenderer::DisplayListRenderer():
-        mCaches(Caches::getInstance()),
+        mCaches(Caches::getInstance()), mDisplayListData(0),
         mTranslateX(0.0f), mTranslateY(0.0f), mHasTranslate(false),
-        mRestoreSaveCount(-1), mDisplayListData(0) {
+        mRestoreSaveCount(-1) {
 }
 
 DisplayListRenderer::~DisplayListRenderer() {

libs/hwui/DisplayListRenderer.h

@@ -300,8 +300,6 @@ private:
     DefaultKeyedVector<const SkRegion*, const SkRegion*> mRegionMap;
     DefaultKeyedVector<SkiaShader*, SkiaShader*> mShaderMap;
 
-    int mRestoreSaveCount;
-
     Caches& mCaches;
     DisplayListData* mDisplayListData;
 
@@ -309,6 +307,8 @@ private:
     float mTranslateY;
     bool mHasTranslate;
 
+    int mRestoreSaveCount;
+
     friend class DisplayList;
 
 }; // class DisplayListRenderer