commit edaecc1db0584fa017822dfc2da0c968b53967e6
author Andreas Gampe <agampe@google.com> Mon Nov 10 20:54:07 2014 -0800
committer Andreas Gampe <agampe@google.com> Mon Nov 10 21:29:52 2014 -0800
tree dc2db79f490bc2e334c6e3688e099c98e846f381
parent baa73b056cbd4627a84b39a6267065ae56677220

resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp

(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)

Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172

libs/hwui/DisplayList.h

diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 85c2367..9ede003 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -92,8 +92,7 @@
     std::vector<SkPath> mTempPaths;
 };
 
-class DeferStateStruct : public PlaybackStateStruct {
-public:
+struct DeferStateStruct : public PlaybackStateStruct {
     DeferStateStruct(DeferredDisplayList& deferredList, OpenGLRenderer& renderer, int replayFlags)
             : PlaybackStateStruct(renderer, replayFlags, &(deferredList.mAllocator)),
             mDeferredList(deferredList) {}