diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index 112f8d3f5debe..bdb2f8d4c4448 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -567,7 +567,7 @@ void DisplayList::iterateProjectedChildren(OpenGLRenderer& renderer, T& handler, template 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) { diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp index 5abfe79e08d8e..3b1d5677238b8 100644 --- a/libs/hwui/DisplayListRenderer.cpp +++ b/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() { diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h index 6c11e5976ae3a..1fb72ce319d5d 100644 --- a/libs/hwui/DisplayListRenderer.h +++ b/libs/hwui/DisplayListRenderer.h @@ -300,8 +300,6 @@ private: DefaultKeyedVector mRegionMap; DefaultKeyedVector mShaderMap; - int mRestoreSaveCount; - Caches& mCaches; DisplayListData* mDisplayListData; @@ -309,6 +307,8 @@ private: float mTranslateY; bool mHasTranslate; + int mRestoreSaveCount; + friend class DisplayList; }; // class DisplayListRenderer