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

Commit f92b264a authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "Use std::shared_ptr for SpriteController" into main

parents 9d46ada7 27c6d996

libs/input/MouseCursorController.cpp

+7 −7
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ MouseCursorController::MouseCursorController(PointerControllerContext& context) 
    mLocked.pointerX = 0;

    mLocked.pointerY = 0;

    mLocked.pointerAlpha = 0.0f; // pointer is initially faded

    mLocked.pointerSprite = mContext.getSpriteController()->createSprite();

    mLocked.pointerSprite = mContext.getSpriteController().createSprite();

    mLocked.updatePointerIcon = false;

    mLocked.requestedPointerType = PointerIconStyle::TYPE_NOT_SPECIFIED;

    mLocked.resolvedPointerType = PointerIconStyle::TYPE_NOT_SPECIFIED;
@@ -325,8 +325,8 @@ bool MouseCursorController::doBitmapAnimationLocked(nsecs_t timestamp) REQUIRES( 
    }



    if (timestamp - mLocked.lastFrameUpdatedTime > iter->second.durationPerFrame) {

        sp<SpriteController> spriteController = mContext.getSpriteController();

        spriteController->openTransaction();

        auto& spriteController = mContext.getSpriteController();

        spriteController.openTransaction();



        int incr = (timestamp - mLocked.lastFrameUpdatedTime) / iter->second.durationPerFrame;

        mLocked.animationFrameIndex += incr;
@@ -336,7 +336,7 @@ bool MouseCursorController::doBitmapAnimationLocked(nsecs_t timestamp) REQUIRES( 
        }

        mLocked.pointerSprite->setIcon(iter->second.animationFrames[mLocked.animationFrameIndex]);



        spriteController->closeTransaction();

        spriteController.closeTransaction();

    }

    // Keep animating.

    return true;
@@ -346,8 +346,8 @@ void MouseCursorController::updatePointerLocked() REQUIRES(mLock) { 
    if (!mLocked.viewport.isValid()) {

        return;

    }

    sp<SpriteController> spriteController = mContext.getSpriteController();

    spriteController->openTransaction();

    auto& spriteController = mContext.getSpriteController();

    spriteController.openTransaction();



    mLocked.pointerSprite->setLayer(Sprite::BASE_LAYER_POINTER);

    mLocked.pointerSprite->setPosition(mLocked.pointerX, mLocked.pointerY);
@@ -392,7 +392,7 @@ void MouseCursorController::updatePointerLocked() REQUIRES(mLock) { 
        mLocked.updatePointerIcon = false;

    }



    spriteController->closeTransaction();

    spriteController.closeTransaction();

}



void MouseCursorController::loadResourcesLocked(bool getAdditionalMouseResources) REQUIRES(mLock) {

libs/input/PointerController.cpp

+3 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void PointerController::DisplayInfoListener::onPointerControllerDestroyed() { 


std::shared_ptr<PointerController> PointerController::create(

        const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper,

        const sp<SpriteController>& spriteController) {

        SpriteController& spriteController) {

    // using 'new' to access non-public constructor

    std::shared_ptr<PointerController> controller = std::shared_ptr<PointerController>(

            new PointerController(policy, looper, spriteController));
@@ -85,8 +85,7 @@ std::shared_ptr<PointerController> PointerController::create( 
}



PointerController::PointerController(const sp<PointerControllerPolicyInterface>& policy,

                                     const sp<Looper>& looper,

                                     const sp<SpriteController>& spriteController)

                                     const sp<Looper>& looper, SpriteController& spriteController)

      : PointerController(

                policy, looper, spriteController,

                [](const sp<android::gui::WindowInfosListener>& listener) {
@@ -97,8 +96,7 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& 
                }) {}



PointerController::PointerController(const sp<PointerControllerPolicyInterface>& policy,

                                     const sp<Looper>& looper,

                                     const sp<SpriteController>& spriteController,

                                     const sp<Looper>& looper, SpriteController& spriteController,

                                     WindowListenerConsumer registerListener,

                                     WindowListenerConsumer unregisterListener)

      : mContext(policy, looper, spriteController, *this),

libs/input/PointerController.h

+3 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class PointerController : public PointerControllerInterface { 
public:

    static std::shared_ptr<PointerController> create(

            const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper,

            const sp<SpriteController>& spriteController);

            SpriteController& spriteController);



    ~PointerController() override;
@@ -83,13 +83,12 @@ protected: 


    // Constructor used to test WindowInfosListener registration.

    PointerController(const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper,

                      const sp<SpriteController>& spriteController,

                      WindowListenerConsumer registerListener,

                      SpriteController& spriteController, WindowListenerConsumer registerListener,

                      WindowListenerConsumer unregisterListener);



private:

    PointerController(const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper,

                      const sp<SpriteController>& spriteController);

                      SpriteController& spriteController);



    friend PointerControllerContext::LooperCallback;

    friend PointerControllerContext::MessageHandler;

libs/input/PointerControllerContext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ namespace android { 


PointerControllerContext::PointerControllerContext(

        const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper,

        const sp<SpriteController>& spriteController, PointerController& controller)

        SpriteController& spriteController, PointerController& controller)

      : mPolicy(policy),

        mLooper(looper),

        mSpriteController(spriteController),
@@ -93,7 +93,7 @@ sp<PointerControllerPolicyInterface> PointerControllerContext::getPolicy() { 
    return mPolicy;

}



sp<SpriteController> PointerControllerContext::getSpriteController() {

SpriteController& PointerControllerContext::getSpriteController() {

    return mSpriteController;

}

libs/input/PointerControllerContext.h

+3 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public: 
class PointerControllerContext {

public:

    PointerControllerContext(const sp<PointerControllerPolicyInterface>& policy,

                             const sp<Looper>& looper, const sp<SpriteController>& spriteController,

                             const sp<Looper>& looper, SpriteController& spriteController,

                             PointerController& controller);

    ~PointerControllerContext();
@@ -109,7 +109,7 @@ public: 
    void setCallbackController(std::shared_ptr<PointerController> controller);



    sp<PointerControllerPolicyInterface> getPolicy();

    sp<SpriteController> getSpriteController();

    SpriteController& getSpriteController();



    void handleDisplayEvents();
@@ -163,7 +163,7 @@ private: 


    sp<PointerControllerPolicyInterface> mPolicy;

    sp<Looper> mLooper;

    sp<SpriteController> mSpriteController;

    SpriteController& mSpriteController;

    sp<MessageHandler> mHandler;

    sp<LooperCallback> mCallback;