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

Verified Commit b674164a authored by Saalim Quadri's avatar Saalim Quadri
Browse files

Resolve conflicting third_party patch 

* Ref: https://skia-review.googlesource.com/c/skia/+/1065436



Signed-off-by: default avatarSaalim Quadri <danascape@gmail.com>
parent 2becd860

build/third_party/Multiple-fingerprinting-mitigations.patch

+19 −19
Original line number Diff line number Diff line 
From 647f53724dd75bb156e035e0ceb20f145e85d605 Mon Sep 17 00:00:00 2001

From 40c7e8aac5a6c56b28b1026e291e09f92830a755 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Fri, 27 Jun 2025 11:55:45 +0000

Subject: Multiple fingerprinting mitigations
@@ -8,17 +8,17 @@ Subject: Multiple fingerprinting mitigations 
 1 file changed, 8 insertions(+), 8 deletions(-)



diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h

index e3379cbcf9..ca31c83a12 100644

index 12d5a0a1e6..a499537129 100644

--- a/include/core/SkPixmap.h

+++ b/include/core/SkPixmap.h

@@ -396,8 +396,8 @@ public:

         @return   readable unsigned 8-bit pointer to pixel at (x, y)

     */

     const uint8_t* addr8(int x, int y) const {

-        SkASSERT((unsigned)x < (unsigned)fInfo.width());

-        SkASSERT((unsigned)y < (unsigned)fInfo.height());

+        SkASSERT_RELEASE((unsigned)x < (unsigned)fInfo.width());

+        SkASSERT_RELEASE((unsigned)y < (unsigned)fInfo.height());

-        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

-        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

+        SkASSERTF_RELEASE(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

+        SkASSERTF_RELEASE(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

         return (const uint8_t*)((const char*)this->addr8() + (size_t)y * fRowBytes + (x << 0));

     }
@@ -26,10 +26,10 @@ index e3379cbcf9..ca31c83a12 100644 
         @return   readable unsigned 16-bit pointer to pixel at (x, y)

     */

     const uint16_t* addr16(int x, int y) const {

-        SkASSERT((unsigned)x < (unsigned)fInfo.width());

-        SkASSERT((unsigned)y < (unsigned)fInfo.height());

+        SkASSERT_RELEASE((unsigned)x < (unsigned)fInfo.width());

+        SkASSERT_RELEASE((unsigned)y < (unsigned)fInfo.height());

-        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

-        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

+        SkASSERTF_RELEASE(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

+        SkASSERTF_RELEASE(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

         return (const uint16_t*)((const char*)this->addr16() + (size_t)y * fRowBytes + (x << 1));

     }
@@ -37,10 +37,10 @@ index e3379cbcf9..ca31c83a12 100644 
         @return   readable unsigned 32-bit pointer to pixel at (x, y)

     */

     const uint32_t* addr32(int x, int y) const {

-        SkASSERT((unsigned)x < (unsigned)fInfo.width());

-        SkASSERT((unsigned)y < (unsigned)fInfo.height());

+        SkASSERT_RELEASE((unsigned)x < (unsigned)fInfo.width());

+        SkASSERT_RELEASE((unsigned)y < (unsigned)fInfo.height());

-        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

-        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

+        SkASSERTF_RELEASE(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

+        SkASSERTF_RELEASE(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

         return (const uint32_t*)((const char*)this->addr32() + (size_t)y * fRowBytes + (x << 2));

     }
@@ -48,13 +48,13 @@ index e3379cbcf9..ca31c83a12 100644 
         @return   readable unsigned 64-bit pointer to pixel at (x, y)

     */

     const uint64_t* addr64(int x, int y) const {

-        SkASSERT((unsigned)x < (unsigned)fInfo.width());

-        SkASSERT((unsigned)y < (unsigned)fInfo.height());

+        SkASSERT_RELEASE((unsigned)x < (unsigned)fInfo.width());

+        SkASSERT_RELEASE((unsigned)y < (unsigned)fInfo.height());

-        SkASSERTF(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

-        SkASSERTF(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

+        SkASSERTF_RELEASE(x >= 0 && x < this->width(), "x=%d; width=%d\n", x, fInfo.width());

+        SkASSERTF_RELEASE(y >= 0 && y < this->height(), "y=%d; height=%d\n", y, fInfo.height());

         return (const uint64_t*)((const char*)this->addr64() + (size_t)y * fRowBytes + (x << 3));

     }

 

-- 

2.50.0

2.51.2