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

Commit f46f9cc3 authored by Candice Lo's avatar Candice Lo Committed by Candice
Browse files

Revert "Revert "feat(force invert): also count areas of draw cal..." 

Revert submission 33149009-revert-30679429-forcedark-colorarea-detection-KGFLTNVUGM

Reason for revert: Relanding the ColorArea mechanisms

Reverted changes: /q/submissionid:33149009-revert-30679429-forcedark-colorarea-detection-KGFLTNVUGM
Relanding changes: /q/submissionid:30679429-forcedark-colorarea-detection

Bug: 372558459
Test: None - relanding without changes
Flag: android.view.accessibility.force_invert_color
Change-Id: Iedb063483398943bf4b15b519c223accfe77eded
parent 13ae3e72

libs/hwui/CanvasTransform.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static BitmapPalette paletteForColorHSV(SkColor color) { 
    return hsv[2] >= .5f ? BitmapPalette::Light : BitmapPalette::Dark;

}



static BitmapPalette filterPalette(const SkPaint* paint, BitmapPalette palette) {

BitmapPalette filterPalette(const SkPaint* paint, BitmapPalette palette) {

    if (palette == BitmapPalette::Unknown || !paint || !paint->getColorFilter()) {

        return palette;

    }

libs/hwui/CanvasTransform.h

+3 −0
Original line number Diff line number Diff line
@@ -48,4 +48,7 @@ bool transformPaint(ColorTransform transform, SkPaint* paint, BitmapPalette pale 
SkColor transformColor(ColorTransform transform, SkColor color);

SkColor transformColorInverse(ColorTransform transform, SkColor color);



/** Returns a palette corrected in case it is tinted by the given paint's filter */

BitmapPalette filterPalette(const SkPaint* paint, BitmapPalette palette);



}  // namespace android::uirenderer

libs/hwui/ColorArea.cpp

+27 −5
Original line number Diff line number Diff line
@@ -16,23 +16,27 @@ 


#include "ColorArea.h"



#include "CanvasTransform.h"

#include "utils/MathUtils.h"



namespace android::uirenderer {



constexpr static int kMinimumAlphaToConsiderArea = 200;



inline uint64_t calculateArea(int32_t width, int32_t height) {

    // HWUI doesn't draw anything with negative width or height

    if (width <= 0 || height <= 0) return 0;



    return width * height;

}



void ColorArea::addArea(const SkRect& rect, const SkPaint* paint) {

    addArea(rect.width(), rect.height(), paint);

}



void ColorArea::addArea(int32_t width, int32_t height, const SkPaint* paint) {

    if (!paint) return;

    // HWUI doesn't draw anything with negative width or height

    if (width <= 0 || height <= 0) return;



    uint64_t area = width * height;

    addArea(area, *paint);

    addArea(calculateArea(width, height), *paint);

}



void ColorArea::addArea(uint64_t area, const SkPaint& paint) {
@@ -48,6 +52,24 @@ void ColorArea::addArea(uint64_t area, const SkPaint& paint) { 
    addArea(area, paint.getColor());

}



void ColorArea::addArea(const SkRect& bounds, const SkPaint& paint,

                        android::BitmapPalette palette) {

    palette = filterPalette(&paint, palette);

    auto area = calculateArea(bounds.width(), bounds.height());

    switch (palette) {

        case android::BitmapPalette::Light:

            addArea(area, Light);

            break;

        case android::BitmapPalette::Dark:

            addArea(area, Dark);

            break;

        case android::BitmapPalette::Colorful:

        case android::BitmapPalette::Unknown:

            addArea(area, Unknown);

            break;

    }

}



void ColorArea::addArea(uint64_t area, SkColor color) {

    if (CC_UNLIKELY(SkColorGetA(color) < kMinimumAlphaToConsiderArea)) return;

libs/hwui/ColorArea.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <SkCanvas.h>

#include <SkPaintFilterCanvas.h>



#include "hwui/Bitmap.h"

#include "utils/Color.h"

#include "utils/Macros.h"
@@ -68,6 +69,11 @@ public: 
    /**

     * See [addArea(uint64_t, SkPaint&)]

     */

    void addArea(const SkRect& rect, const SkPaint& paint, android::BitmapPalette palette);



    /**

     * See [addArea(long, SkPaint&)]

     */

    void addArea(int32_t width, int32_t height, const SkPaint* paint);



    /**

libs/hwui/RecordingCanvas.cpp

+12 −1
Original line number Diff line number Diff line
@@ -863,7 +863,18 @@ constexpr bool has_bounds = std::experimental::is_detected_v<has_bounds_helper, 


template <class T>

constexpr color_area_fn colorAreaForOp() {

    if constexpr (has_paint<T> && has_bounds<T>) {

    if constexpr (has_palette<T> && has_bounds<T>) {

        return [](const void* opRaw, ColorArea* accumulator) {

            const T* op = reinterpret_cast<const T*>(opRaw);

            const SkPaint* paint = &op->paint;

            if (!paint) return;



            auto rect = op->getConservativeBounds();

            if (!rect.has_value()) return;



            accumulator->addArea(*rect, *paint, op->palette);

        };

    } else if constexpr (has_paint<T> && has_bounds<T>) {

        return [](const void* opRaw, ColorArea* accumulator) {

            const T* op = reinterpret_cast<const T*>(opRaw);

            const SkPaint* paint = &op->paint;