This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch upstream/28.5.0 in repository pale-moon. commit a6ddde9097fbef2940c6a4f785dae15978ef2533 Author: wolfbeast <mcwerewolf@wolfbeast.com> Date: Thu Feb 14 16:59:52 2019 +0100 Port several Skia upstream fixes. --- gfx/skia/skia/include/core/SkPath.h | 2 +- gfx/skia/skia/include/core/SkPathRef.h | 2 ++ gfx/skia/skia/src/core/SkPath.cpp | 23 ++++++++++--- gfx/skia/skia/src/core/SkPathPriv.h | 5 +++ gfx/skia/skia/src/core/SkScan_Path.cpp | 61 +++++++++++++++++----------------- mobile/android/app/mobile.js | 4 +-- modules/libpref/init/all.js | 2 -- 7 files changed, 60 insertions(+), 39 deletions(-) diff --git a/gfx/skia/skia/include/core/SkPath.h b/gfx/skia/skia/include/core/SkPath.h index d1af4f3..bde07c4 100644 --- a/gfx/skia/skia/include/core/SkPath.h +++ b/gfx/skia/skia/include/core/SkPath.h @@ -373,7 +373,7 @@ public: @param extraPtCount The number of extra points the path should preallocate for. */ - void incReserve(unsigned extraPtCount); + void incReserve(int extraPtCount); /** Set the beginning of the next contour to the point (x,y). diff --git a/gfx/skia/skia/include/core/SkPathRef.h b/gfx/skia/skia/include/core/SkPathRef.h index 0c5cc1a..d497e7e 100644 --- a/gfx/skia/skia/include/core/SkPathRef.h +++ b/gfx/skia/skia/include/core/SkPathRef.h @@ -547,6 +547,8 @@ private: friend class PathRefTest_Private; friend class ForceIsRRect_Private; // unit test isRRect + friend class SkPath; + friend class SkPathPriv; }; #endif diff --git a/gfx/skia/skia/src/core/SkPath.cpp b/gfx/skia/skia/src/core/SkPath.cpp index 8f93c9c..db160d9 100644 --- a/gfx/skia/skia/src/core/SkPath.cpp +++ b/gfx/skia/skia/src/core/SkPath.cpp @@ -716,9 +716,11 @@ void SkPath::setConvexity(Convexity c) { fFirstDirection = SkPathPriv::kUnknown_FirstDirection; \ } while (0) -void SkPath::incReserve(U16CPU inc) { +void SkPath::incReserve(int inc) { SkDEBUGCODE(this->validate();) - SkPathRef::Editor(&fPathRef, inc, inc); + if (inc > 0) { + SkPathRef::Editor(&fPathRef, inc, inc); + } SkDEBUGCODE(this->validate();) } @@ -1691,6 +1693,13 @@ static void subdivide_cubic_to(SkPath* path, const SkPoint pts[4], } void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const { + if (matrix.isIdentity()) { + if (dst != nullptr && dst != this) { + *dst = *this; + } + return; + } + SkDEBUGCODE(this->validate();) if (dst == nullptr) { dst = (SkPath*)this; @@ -1738,13 +1747,20 @@ void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const { matrix.mapPoints(ed.points(), ed.pathRef()->countPoints()); dst->fFirstDirection = SkPathPriv::kUnknown_FirstDirection; } else { + Convexity convexity = Convexity(fConvexity); + SkPathRef::CreateTransformedCopy(&dst->fPathRef, *fPathRef.get(), matrix); if (this != dst) { dst->fFillType = fFillType; - dst->fConvexity = fConvexity; dst->fIsVolatile = fIsVolatile; } + + if (matrix.isScaleTranslate() && SkPathPriv::IsAxisAligned(*this)) { + dst->fConvexity = convexity; + } else { + dst->fConvexity = kUnknown_Convexity; + } if (SkPathPriv::kUnknown_FirstDirection == fFirstDirection) { dst->fFirstDirection = SkPathPriv::kUnknown_FirstDirection; @@ -1758,7 +1774,6 @@ void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const { } else if (det2x2 > 0) { dst->fFirstDirection = fFirstDirection.load(); } else { - dst->fConvexity = kUnknown_Convexity; dst->fFirstDirection = SkPathPriv::kUnknown_FirstDirection; } } diff --git a/gfx/skia/skia/src/core/SkPathPriv.h b/gfx/skia/skia/src/core/SkPathPriv.h index 029cb75..cfcdc4c 100644 --- a/gfx/skia/skia/src/core/SkPathPriv.h +++ b/gfx/skia/skia/src/core/SkPathPriv.h @@ -121,6 +121,11 @@ public: static const SkScalar* ConicWeightData(const SkPath& path) { return path.fPathRef->conicWeights(); } + + static bool IsAxisAligned(const SkPath& path) { + SkRect tmp; + return (path.fPathRef->fIsRRect | path.fPathRef->fIsOval) || path.isRect(&tmp); + } }; #endif diff --git a/gfx/skia/skia/src/core/SkScan_Path.cpp b/gfx/skia/skia/src/core/SkScan_Path.cpp index d15d2d5..5e00e3a 100644 --- a/gfx/skia/skia/src/core/SkScan_Path.cpp +++ b/gfx/skia/skia/src/core/SkScan_Path.cpp @@ -241,9 +241,17 @@ static bool update_edge(SkEdge* edge, int last_y) { return false; } -static void walk_convex_edges(SkEdge* prevHead, SkPath::FillType, - SkBlitter* blitter, int start_y, int stop_y, - PrePostProc proc) { +// Unexpected conditions for which we need to return +#define ASSERT_RETURN(cond) \ + do { \ + if (!(cond)) { \ + SkASSERT(false); \ + return; \ + } \ + } while (0) + +// Needs Y to only change once (looser than convex in X) +static void walk_simple_edges(SkEdge* prevHead, SkBlitter* blitter, int start_y, int stop_y) { validate_sort(prevHead->fNext); SkEdge* leftE = prevHead->fNext; @@ -258,30 +266,28 @@ static void walk_convex_edges(SkEdge* prevHead, SkPath::FillType, // not lining up, so we take the max. int local_top = SkMax32(leftE->fFirstY, riteE->fFirstY); #endif - SkASSERT(local_top >= start_y); + ASSERT_RETURN(local_top >= start_y); - for (;;) { + while (local_top < stop_y) { SkASSERT(leftE->fFirstY <= stop_y); SkASSERT(riteE->fFirstY <= stop_y); - if (leftE->fX > riteE->fX || (leftE->fX == riteE->fX && - leftE->fDX > riteE->fDX)) { - SkTSwap(leftE, riteE); - } - int local_bot = SkMin32(leftE->fLastY, riteE->fLastY); local_bot = SkMin32(local_bot, stop_y - 1); - SkASSERT(local_top <= local_bot); + ASSERT_RETURN(local_top <= local_bot); SkFixed left = leftE->fX; SkFixed dLeft = leftE->fDX; SkFixed rite = riteE->fX; SkFixed dRite = riteE->fDX; int count = local_bot - local_top; - SkASSERT(count >= 0); + ASSERT_RETURN(count >= 0); if (0 == (dLeft | dRite)) { int L = SkFixedRoundToInt(left); int R = SkFixedRoundToInt(rite); + if (L > R) { + SkTSwap(L, R); + } if (L < R) { count += 1; blitter->blitRect(L, local_top, R - L, count); @@ -291,6 +297,9 @@ static void walk_convex_edges(SkEdge* prevHead, SkPath::FillType, do { int L = SkFixedRoundToInt(left); int R = SkFixedRoundToInt(rite); + if (L > R) { + SkTSwap(L, R); + } if (L < R) { blitter->blitH(L, local_top, R - L); } @@ -303,28 +312,21 @@ static void walk_convex_edges(SkEdge* prevHead, SkPath::FillType, leftE->fX = left; riteE->fX = rite; - if (update_edge(leftE, local_bot)) { + if (!update_edge(leftE, local_bot)) { if (currE->fFirstY >= stop_y) { - break; + return; // we're done } leftE = currE; currE = currE->fNext; + ASSERT_RETURN(leftE->fFirstY == local_top); } - if (update_edge(riteE, local_bot)) { + if (!update_edge(riteE, local_bot)) { if (currE->fFirstY >= stop_y) { - break; + return; // we're done } riteE = currE; currE = currE->fNext; - } - - SkASSERT(leftE); - SkASSERT(riteE); - - // check our bottom clip - SkASSERT(local_top == local_bot + 1); - if (local_top >= stop_y) { - break; + ASSERT_RETURN(riteE->fFirstY == local_top); } } } @@ -500,9 +502,9 @@ void sk_fill_path(const SkPath& path, const SkIRect* clipRect, SkBlitter* blitte proc = PrePostInverseBlitterProc; } - if (path.isConvex() && (nullptr == proc)) { - SkASSERT(count >= 2); // convex walker does not handle missing right edges - walk_convex_edges(&headEdge, path.getFillType(), blitter, start_y, stop_y, nullptr); + // count >= 2 is required as the convex walker does not handle missing right edges + if (path.isConvex() && (nullptr == proc) && count >= 2) { + walk_simple_edges(&headEdge, blitter, start_y, stop_y); } else { int rightEdge; if (clipRect) { @@ -766,8 +768,7 @@ static void sk_fill_triangle(const SkPoint pts[], const SkIRect* clipRect, if (clipRect && start_y < clipRect->fTop) { start_y = clipRect->fTop; } - walk_convex_edges(&headEdge, SkPath::kEvenOdd_FillType, blitter, start_y, stop_y, nullptr); -// walk_edges(&headEdge, SkPath::kEvenOdd_FillType, blitter, start_y, stop_y, nullptr); + walk_simple_edges(&headEdge, blitter, start_y, stop_y); } void SkScan::FillTriangle(const SkPoint pts[], const SkRasterClip& clip, diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index ef4764d..a28cba4 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -780,9 +780,9 @@ pref("dom.phonenumber.substringmatching.BR", 8); pref("dom.phonenumber.substringmatching.CO", 10); pref("dom.phonenumber.substringmatching.VE", 7); -// Enable hardware-accelerated Skia canvas +// Support, but deprecate, hardware-accelerated Skia canvas pref("gfx.canvas.azure.backends", "skia"); -pref("gfx.canvas.azure.accelerated", true); +pref("gfx.canvas.azure.accelerated", false); // See ua-update.json.in for the packaged UA override list pref("general.useragent.updates.enabled", true); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index f6e9017..9bdd00c 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -795,8 +795,6 @@ pref("gfx.content.azure.backends", "direct2d1.1,cairo"); #ifdef XP_MACOSX pref("gfx.content.azure.backends", "cg"); pref("gfx.canvas.azure.backends", "skia,cg"); -// Accelerated cg canvas where available (10.7+) -pref("gfx.canvas.azure.accelerated", true); #else // Linux etc. pref("gfx.canvas.azure.backends", "skia,cairo"); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git