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

Commit 873e2eee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move FloatRect from libgfx to libui"

parents 7777e9f6 5a423eaa

include/gfx/FloatRect.h→include/ui/FloatRect.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
#pragma once

#pragma once





namespace android {

namespace android {

namespace gfx {





class FloatRect {

class FloatRect {

public:

public:
@@ -38,5 +37,4 @@ inline bool operator==(const FloatRect& a, const FloatRect& b) { 
    return a.left == b.left && a.top == b.top && a.right == b.right && a.bottom == b.bottom;

    return a.left == b.left && a.top == b.top && a.right == b.right && a.bottom == b.bottom;

}

}





}  // namespace gfx

}  // namespace android
 
}  // namespace android

include/ui/Rect.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,12 +17,12 @@ 
#ifndef ANDROID_UI_RECT

#ifndef ANDROID_UI_RECT

#define ANDROID_UI_RECT

#define ANDROID_UI_RECT





#include <gfx/FloatRect.h>

#include <utils/Flattenable.h>

#include <utils/Flattenable.h>

#include <utils/Log.h>

#include <utils/Log.h>

#include <utils/TypeHelpers.h>

#include <utils/TypeHelpers.h>

#include <log/log.h>

#include <log/log.h>





#include <ui/FloatRect.h>

#include <ui/Point.h>

#include <ui/Point.h>





#include <android/rect.h>

#include <android/rect.h>
@@ -185,7 +185,7 @@ public: 
    inline int32_t height() const { return getHeight(); }

    inline int32_t height() const { return getHeight(); }

    inline void set(const Rect& rhs) { operator = (rhs); }

    inline void set(const Rect& rhs) { operator = (rhs); }





    gfx::FloatRect toFloatRect() const {

    FloatRect toFloatRect() const {

        return {static_cast<float>(left), static_cast<float>(top),

        return {static_cast<float>(left), static_cast<float>(top),

                static_cast<float>(right), static_cast<float>(bottom)};

                static_cast<float>(right), static_cast<float>(bottom)};

    }

    }

services/surfaceflinger/DisplayHardware/HWC2.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -23,9 +23,8 @@ 
#include "HWC2.h"

#include "HWC2.h"

#include "ComposerHal.h"

#include "ComposerHal.h"





#include <gfx/FloatRect.h>



#include <ui/Fence.h>

#include <ui/Fence.h>

#include <ui/FloatRect.h>

#include <ui/GraphicBuffer.h>

#include <ui/GraphicBuffer.h>

#include <ui/Region.h>

#include <ui/Region.h>
@@ -74,12 +73,12 @@ extern "C" { 
}

}





using android::Fence;

using android::Fence;

using android::FloatRect;

using android::GraphicBuffer;

using android::GraphicBuffer;

using android::HdrCapabilities;

using android::HdrCapabilities;

using android::Rect;

using android::Rect;

using android::Region;

using android::Region;

using android::sp;

using android::sp;

using android::gfx::FloatRect;

using android::hardware::Return;

using android::hardware::Return;

using android::hardware::Void;

using android::hardware::Void;

services/surfaceflinger/DisplayHardware/HWC2.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -38,12 +38,10 @@ 




namespace android {

namespace android {

    class Fence;

    class Fence;

    class FloatRect;

    class GraphicBuffer;

    class GraphicBuffer;

    class Rect;

    class Rect;

    class Region;

    class Region;

    namespace gfx {

        class FloatRect;

    }

    namespace Hwc2 {

    namespace Hwc2 {

        class Composer;

        class Composer;

    }

    }
@@ -410,7 +408,7 @@ public: 
    [[clang::warn_unused_result]] Error setSidebandStream(

    [[clang::warn_unused_result]] Error setSidebandStream(

            const native_handle_t* stream);

            const native_handle_t* stream);

    [[clang::warn_unused_result]] Error setSourceCrop(

    [[clang::warn_unused_result]] Error setSourceCrop(

            const android::gfx::FloatRect& crop);

            const android::FloatRect& crop);

    [[clang::warn_unused_result]] Error setTransform(Transform transform);

    [[clang::warn_unused_result]] Error setTransform(Transform transform);

    [[clang::warn_unused_result]] Error setVisibleRegion(

    [[clang::warn_unused_result]] Error setVisibleRegion(

            const android::Region& region);

            const android::Region& region);

services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1031,7 +1031,7 @@ public: 
    virtual void setFrame(const Rect& frame) {

    virtual void setFrame(const Rect& frame) {

        getLayer()->displayFrame = reinterpret_cast<hwc_rect_t const&>(frame);

        getLayer()->displayFrame = reinterpret_cast<hwc_rect_t const&>(frame);

    }

    }

    virtual void setCrop(const gfx::FloatRect& crop) {

    virtual void setCrop(const FloatRect& crop) {

        if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {

        if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {

            getLayer()->sourceCropf = reinterpret_cast<hwc_frect_t const&>(crop);

            getLayer()->sourceCropf = reinterpret_cast<hwc_frect_t const&>(crop);

        } else {

        } else {