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

Commit cdf83204 authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceFlinger: Add "Abstract" Layer type. 

Add an Abstract Layer type which exists only to be a parent. We
will use this to more cleanly represent the various hierarchy Layers
from the WM and for an upcoming screenshot rework.

Bug: 72760590
Test: Existing tests pass
Change-Id: Icd19ab0a467585660a95ae37b9c5dd4b8106da9d
parent 105e64be

services/surfaceflinger/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ filegroup { 
        "BufferLayerConsumer.cpp",

        "BufferLayerConsumer.cpp",

        "Client.cpp",

        "Client.cpp",

        "ColorLayer.cpp",

        "ColorLayer.cpp",

        "ContainerLayer.cpp",

        "DisplayDevice.cpp",

        "DisplayDevice.cpp",

        "DisplayHardware/ComposerHal.cpp",

        "DisplayHardware/ComposerHal.cpp",

        "DisplayHardware/FramebufferSurface.cpp",

        "DisplayHardware/FramebufferSurface.cpp",

services/surfaceflinger/ColorLayer.h

+4 −11
Original line number Original line Diff line number Diff line
@@ -13,16 +13,13 @@ 
 * See the License for the specific language governing permissions and

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * limitations under the License.

 */

 */

#pragma once





#ifndef ANDROID_COLOR_LAYER_H

#define ANDROID_COLOR_LAYER_H



#include <stdint.h>

#include <sys/types.h>

#include <sys/types.h>





#include "Layer.h"

#include <cstdint>





// ---------------------------------------------------------------------------

#include "Layer.h"





namespace android {

namespace android {
@@ -40,8 +37,4 @@ public: 
    void setPerFrameData(const sp<const DisplayDevice>& displayDevice) override;

    void setPerFrameData(const sp<const DisplayDevice>& displayDevice) override;

};

};





// ---------------------------------------------------------------------------

} // namespace android
 


}; // namespace android



#endif // ANDROID_COLOR_LAYER_H

services/surfaceflinger/ContainerLayer.cpp

0 → 100644
+39 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



// #define LOG_NDEBUG 0

#undef LOG_TAG

#define LOG_TAG "AbstractLayer"



#include "AbstractLayer.h"



namespace android {



AbstractLayer::AbstractLayer(SurfaceFlinger* flinger, const sp<Client>& client, const String8& name,

                             uint32_t w, uint32_t h, uint32_t flags)

      : Layer(flinger, client, name, w, h, flags) {

    mDrawingState = mCurrentState;

}



void AbstractLayer::onDraw(const RenderArea&, const Region& /* clip */, bool) const {}



bool AbstractLayer::isVisible() const {

    return !isHiddenByPolicy();

}



void AbstractLayer::setPerFrameData(const sp<const DisplayDevice>&) {}



} // namespace android

services/surfaceflinger/ContainerLayer.h

0 → 100644
+40 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include <sys/types.h>



#include <cstdint>



#include "Layer.h"



namespace android {



class AbstractLayer : public Layer {

public:

    AbstractLayer(SurfaceFlinger* flinger, const sp<Client>& client, const String8& name,

                  uint32_t w, uint32_t h, uint32_t flags);

    virtual ~AbstractLayer() = default;



    const char* getTypeId() const override { return "AbstractLayer"; }

    void onDraw(const RenderArea& renderArea, const Region& clip,

                bool useIdentityTransform) const override;

    bool isVisible() const override;



    void setPerFrameData(const sp<const DisplayDevice>& displayDevice) override;

};



} // namespace android

services/surfaceflinger/Layer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
#ifndef ANDROID_LAYER_H

#ifndef ANDROID_LAYER_H

#define ANDROID_LAYER_H

#define ANDROID_LAYER_H





#include <stdint.h>

#include <sys/types.h>

#include <sys/types.h>





#include <utils/RefBase.h>

#include <utils/RefBase.h>
@@ -35,6 +34,7 @@ 
#include <gui/BufferQueue.h>

#include <gui/BufferQueue.h>





#include <list>

#include <list>

#include <cstdint>





#include "Client.h"

#include "Client.h"

#include "FrameTracker.h"

#include "FrameTracker.h"