Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292db41e authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "Fix initialization order warning."

parents edee8c5f 5bf3abef

services/surfaceflinger/Layer.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ template <typename T> inline T min(T a, T b) { 
Layer::Layer(SurfaceFlinger* flinger,

Layer::Layer(SurfaceFlinger* flinger,

        DisplayID display, const sp<Client>& client)

        DisplayID display, const sp<Client>& client)

    :   LayerBaseClient(flinger, display, client),

    :   LayerBaseClient(flinger, display, client),

        mFormat(PIXEL_FORMAT_NONE),

        mGLExtensions(GLExtensions::getInstance()),

        mGLExtensions(GLExtensions::getInstance()),

        mNeedsBlending(true),

        mNeedsBlending(true),

        mNeedsDithering(false),

        mNeedsDithering(false),
@@ -59,7 +60,7 @@ Layer::Layer(SurfaceFlinger* flinger, 
        mProtectedByApp(false),

        mProtectedByApp(false),

        mTextureManager(),

        mTextureManager(),

        mBufferManager(mTextureManager),

        mBufferManager(mTextureManager),

        mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE),

        mWidth(0), mHeight(0),

        mNeedsScaling(false), mFixedSize(false)

        mNeedsScaling(false), mFixedSize(false)

{

{

}

}