Bug 1620328 - Set conic-gradient angle range on Skia. r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D65910

--HG--
extra : moz-landing-system : lando

gfx/2d/2D.h

@@ -298,14 +298,22 @@ class RadialGradientPattern : public Pattern {
 class ConicGradientPattern : public Pattern {
  public:
   /// For constructor parameter description, see member data documentation.
-  ConicGradientPattern(const Point& aCenter, Float aAngle,
-                       GradientStops* aStops, const Matrix& aMatrix = Matrix())
-      : mCenter(aCenter), mAngle(aAngle), mStops(aStops), mMatrix(aMatrix) {}
+  ConicGradientPattern(const Point& aCenter, Float aAngle, Float aStartOffset,
+                       Float aEndOffset, GradientStops* aStops,
+                       const Matrix& aMatrix = Matrix())
+      : mCenter(aCenter),
+        mAngle(aAngle),
+        mStartOffset(aStartOffset),
+        mEndOffset(aEndOffset),
+        mStops(aStops),
+        mMatrix(aMatrix) {}
 
   PatternType GetType() const override { return PatternType::CONIC_GRADIENT; }
 
   Point mCenter;  //!< Center of the gradient
   Float mAngle;   //!< Start angle of gradient
+  Float mStartOffset;  // Offset of first stop
+  Float mEndOffset;    // Offset of last stop
   RefPtr<GradientStops>
       mStops;      /**< GradientStops object for this gradient, this
                         should match the backend type of the draw target

gfx/2d/DrawTargetSkia.cpp

@@ -527,9 +527,12 @@ static void SetPaintPattern(SkPaint& aPaint, const Pattern& aPattern,
           mat.preRotate(angle, cx, cy);
         }
 
+        SkTileMode mode = ExtendModeToTileMode(stops->mExtendMode, Axis::BOTH);
         sk_sp<SkShader> shader = SkGradientShader::MakeSweep(
             cx, cy, &stops->mColors.front(), &stops->mPositions.front(),
-            stops->mCount, 0, &mat);
+            stops->mCount, mode, 360 * pat.mStartOffset, 360 * pat.mEndOffset,
+            0, &mat);
+
         if (shader) {
           aPaint.setShader(shader);
         } else {

gfx/2d/DrawTargetWrapAndRecord.cpp

@@ -262,8 +262,9 @@ struct AdjustedPattern final {
         ConicGradientPattern* conGradPat =
             static_cast<ConicGradientPattern*>(mOrigPattern);
         mPattern = new (mConGradPat) ConicGradientPattern(
-            conGradPat->mCenter, conGradPat->mAngle,
-            GetGradientStops(conGradPat->mStops), conGradPat->mMatrix);
+            conGradPat->mCenter, conGradPat->mAngle, conGradPat->mStartOffset,
+            conGradPat->mEndOffset, GetGradientStops(conGradPat->mStops),
+            conGradPat->mMatrix);
         return mPattern;
       }
       default:

gfx/2d/PatternHelpers.h

@@ -91,11 +91,11 @@ class GeneralPattern final {
   }
 
   ConicGradientPattern* InitConicGradientPattern(
-      const Point& aCenter, Float aAngle, GradientStops* aStops,
-      const Matrix& aMatrix = Matrix()) {
+      const Point& aCenter, Float aAngle, Float aStartOffset, Float aEndOffset,
+      GradientStops* aStops, const Matrix& aMatrix = Matrix()) {
     MOZ_ASSERT(!mPattern);
-    mPattern = new (mConicGradientPattern.addr())
-        ConicGradientPattern(aCenter, aAngle, aStops, aMatrix);
+    mPattern = new (mConicGradientPattern.addr()) ConicGradientPattern(
+        aCenter, aAngle, aStartOffset, aEndOffset, aStops, aMatrix);
     return mConicGradientPattern.addr();
   }
 

gfx/2d/RecordedEvent.h

@@ -133,6 +133,8 @@ struct RadialGradientPatternStorage {
 struct ConicGradientPatternStorage {
   Point mCenter;
   Float mAngle;
+  Float mStartOffset;
+  Float mEndOffset;
   ReferencePtr mStops;
   Matrix mMatrix;
 };

gfx/2d/RecordedEventImpl.h

@@ -1680,6 +1680,8 @@ inline void RecordedEvent::StorePattern(PatternStorage& aDestination,
           static_cast<const ConicGradientPattern*>(&aSource);
       store->mCenter = pat->mCenter;
       store->mAngle = pat->mAngle;
+      store->mStartOffset = pat->mStartOffset;
+      store->mEndOffset = pat->mEndOffset;
       store->mMatrix = pat->mMatrix;
       store->mStops = pat->mStops.get();
       return;
@@ -1832,7 +1834,8 @@ inline void RecordedEvent::OutputSimplePatternInfo(
           reinterpret_cast<const ConicGradientPatternStorage*>(
               &aStorage.mStorage);
       aOutput << "ConicGradient (Center: (" << store->mCenter.x << ", "
-              << store->mCenter.y << ") Angle: " << store->mAngle;
+              << store->mCenter.y << ") Angle: " << store->mAngle
+              << " Range:" << store->mStartOffset << " - " << store->mEndOffset;
       return;
     }
     case PatternType::SURFACE: {
@@ -2183,7 +2186,8 @@ struct GenericPattern {
         ConicGradientPatternStorage* storage =
             reinterpret_cast<ConicGradientPatternStorage*>(&mStorage->mStorage);
         mPattern = new (mConGradPat) ConicGradientPattern(
-            storage->mCenter, storage->mAngle,
+            storage->mCenter, storage->mAngle, storage->mStartOffset,
+            storage->mEndOffset,
             storage->mStops ? mTranslator->LookupGradientStops(storage->mStops)
                             : nullptr,
             storage->mMatrix);

gfx/thebes/gfxPattern.cpp

@@ -38,9 +38,11 @@ gfxPattern::gfxPattern(gfxFloat cx0, gfxFloat cy0, gfxFloat radius0,
 }
 
 // conic
-gfxPattern::gfxPattern(gfxFloat cx, gfxFloat cy, gfxFloat angle)
+gfxPattern::gfxPattern(gfxFloat cx, gfxFloat cy, gfxFloat angle,
+                       gfxFloat startOffset, gfxFloat endOffset)
     : mExtend(ExtendMode::CLAMP) {
-  mGfxPattern.InitConicGradientPattern(Point(cx, cy), angle, nullptr);
+  mGfxPattern.InitConicGradientPattern(Point(cx, cy), angle, startOffset,
+                                       endOffset, nullptr);
 }
 
 // Azure

gfx/thebes/gfxPattern.h

@@ -26,7 +26,8 @@ class gfxPattern final {
   gfxPattern(gfxFloat x0, gfxFloat y0, gfxFloat x1, gfxFloat y1);  // linear
   gfxPattern(gfxFloat cx0, gfxFloat cy0, gfxFloat radius0, gfxFloat cx1,
              gfxFloat cy1, gfxFloat radius1);            // radial
-  gfxPattern(gfxFloat cx, gfxFloat cy, gfxFloat angle);  // conic
+  gfxPattern(gfxFloat cx, gfxFloat cy, gfxFloat angle, gfxFloat startOffset,
+             gfxFloat endOffset);  // conic
   gfxPattern(mozilla::gfx::SourceSurface* aSurface,
              const mozilla::gfx::Matrix& aPatternToUserSpace);
 

layout/painting/nsCSSRenderingGradients.cpp

@@ -897,7 +897,7 @@ void nsCSSGradientRenderer::Paint(gfxContext& aContext, const nsRect& aDest,
   // This keeps the gradient line as large as the box and doesn't
   // lets us avoiding having to get padding correct for stops
   // at 0 and 1
-  if (!mGradient->Repeating() || stopDelta == 0.0) {
+  if (!mGradient->Repeating() || (!mGradient->IsConic() && stopDelta == 0.0)) {
     stopOrigin = std::min(stopOrigin, 0.0);
     stopEnd = std::max(stopEnd, 1.0);
   }
@@ -951,7 +951,8 @@ void nsCSSGradientRenderer::Paint(gfxContext& aContext, const nsRect& aDest,
       matrix.PreTranslate(-mLineStart);
     }
   } else {
-    gradientPattern = new gfxPattern(mCenter.x, mCenter.y, mAngle);
+    gradientPattern =
+        new gfxPattern(mCenter.x, mCenter.y, mAngle, stopOrigin, stopEnd);
   }
   // Use a pattern transform to take account of source and dest rects
   matrix.PreTranslate(gfxPoint(mPresContext->CSSPixelsToDevPixels(aSrc.x),