|
 |
f7e2cb |
# HG changeset patch
|
|
|
7d7726 |
# Parent d1d66f7e4d0e7fd45e91e4fcee07555e72046d48
|
|
|
f7e2cb |
For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
|
|
|
f7e2cb |
right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
|
|
|
f7e2cb |
|
|
|
7d7726 |
diff --git a/gfx/skia/skia/include/private/SkNx.h b/gfx/skia/skia/include/private/SkNx.h
|
|
|
7d7726 |
--- a/gfx/skia/skia/include/private/SkNx.h
|
|
|
7d7726 |
+++ b/gfx/skia/skia/include/private/SkNx.h
|
|
|
7d7726 |
@@ -233,17 +233,28 @@ struct SkNx<1,T> {
|
|
|
7d7726 |
AI SkNx operator<<(int bits) const { return fVal << bits; }
|
|
|
7d7726 |
AI SkNx operator>>(int bits) const { return fVal >> bits; }
|
|
|
7d7726 |
|
|
|
7d7726 |
AI SkNx operator+(const SkNx& y) const { return fVal + y.fVal; }
|
|
|
7d7726 |
AI SkNx operator-(const SkNx& y) const { return fVal - y.fVal; }
|
|
|
f7e2cb |
AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
|
|
|
f7e2cb |
AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
|
|
|
f7e2cb |
|
|
|
f7e2cb |
+ // On Big endian the commented out variant doesn't work,
|
|
|
f7e2cb |
+ // and honestly, I have no idea why it exists in the first place.
|
|
|
f7e2cb |
+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
|
|
|
f7e2cb |
+ // which gets a 64-bit integer, and FromBits returns 32-bit,
|
|
|
f7e2cb |
+ // cutting off the wrong half again.
|
|
|
f7e2cb |
+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
|
|
|
f7e2cb |
+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
|
|
|
f7e2cb |
+#ifdef SK_CPU_BENDIAN
|
|
|
f7e2cb |
+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
|
|
|
f7e2cb |
+#else
|
|
|
f7e2cb |
AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
|
|
|
f7e2cb |
+#endif
|
|
|
f7e2cb |
AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
|
|
|
f7e2cb |
AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
|
|
|
f7e2cb |
|
|
|
7d7726 |
AI SkNx operator==(const SkNx& y) const { return FromBits(fVal == y.fVal ? ~0 : 0); }
|
|
|
7d7726 |
AI SkNx operator!=(const SkNx& y) const { return FromBits(fVal != y.fVal ? ~0 : 0); }
|
|
|
7d7726 |
AI SkNx operator<=(const SkNx& y) const { return FromBits(fVal <= y.fVal ? ~0 : 0); }
|
|
|
7d7726 |
AI SkNx operator>=(const SkNx& y) const { return FromBits(fVal >= y.fVal ? ~0 : 0); }
|
|
|
7d7726 |
AI SkNx operator< (const SkNx& y) const { return FromBits(fVal < y.fVal ? ~0 : 0); }
|
|
|
7d7726 |
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
|
|
7d7726 |
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
|
|
7d7726 |
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
|
|
7d7726 |
@@ -198,17 +198,23 @@ namespace SK_OPTS_NS {
|
|
|
7d7726 |
const SkAlpha* mask, size_t maskRB,
|
|
|
7d7726 |
int w, int h) {
|
|
|
7d7726 |
auto fn = [](const Sk4px& d, const Sk4px& aa) {
|
|
|
7d7726 |
// = (s + d(1-sa))aa + d(1-aa)
|
|
|
7d7726 |
// = s*aa + d(1-sa*aa)
|
|
|
f7e2cb |
// ~~~>
|
|
|
f7e2cb |
// a = 1*aa + d(1-1*aa) = aa + d(1-aa)
|
|
|
f7e2cb |
// c = 0*aa + d(1-1*aa) = d(1-aa)
|
|
|
f7e2cb |
+
|
|
|
f7e2cb |
+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
|
|
|
f7e2cb |
+#ifdef SK_CPU_BENDIAN
|
|
|
f7e2cb |
+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
|
|
|
f7e2cb |
+#else
|
|
|
f7e2cb |
return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
|
|
|
f7e2cb |
+#endif
|
|
|
f7e2cb |
+ d.approxMulDiv255(aa.inv());
|
|
|
f7e2cb |
};
|
|
|
f7e2cb |
while (h --> 0) {
|
|
|
7d7726 |
Sk4px::MapDstAlpha(w, dst, mask, fn);
|
|
|
7d7726 |
dst += dstRB / sizeof(*dst);
|
|
|
7d7726 |
mask += maskRB / sizeof(*mask);
|
|
|
7d7726 |
}
|
|
|
7d7726 |
}
|