Changeset 207028 in webkit

Timestamp:

Oct 10, 2016 3:10:55 PM (8 years ago)

Author:

Brent Fulgham

Message:

[Win][Direct2D] Correct Radial Graident Bug
​https://bugs.webkit.org/show_bug.cgi?id=163241

Reviewed by Darin Adler.

Radial gradients were not working correctly under Direct2D because the
points and radius values used were incorrect. D2D wants a center point and
an offset, not a start and end point. It wants an X and Y radius (for an
ellipse), not a radius at the start point, and a radius at the end point.

Covered by existing fast/gradients/css-radial-gradients.html (and others).

• platform/graphics/Image.cpp:

(WebCore::Image::drawTiled): Remove 'notImplemented' code path.

• platform/graphics/win/GradientDirect2D.cpp:

(WebCore::Gradient::generateGradient): Use correct input values to
the Radial Gradient constructor.
(WebCore::Gradient::fill): Generate a gradient if we have no active
one to use.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (2 diffs)
• platform/graphics/win/GradientDirect2D.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win][Direct2D] Correct Radial Graident Bug
+        https://bugs.webkit.org/show_bug.cgi?id=163241
+
+        Reviewed by Darin Adler.
+
+        Radial gradients were not working correctly under Direct2D because the
+        points and radius values used were incorrect. D2D wants a center point and
+        an offset, not a start and end point. It wants an X and Y radius (for an
+        ellipse), not a radius at the start point, and a radius at the end point.
+
+        Covered by existing fast/gradients/css-radial-gradients.html (and others).
+
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::drawTiled): Remove 'notImplemented' code path.
+        * platform/graphics/win/GradientDirect2D.cpp:
+        (WebCore::Gradient::generateGradient): Use correct input values to
+        the Radial Gradient constructor.
+        (WebCore::Gradient::fill): Generate a gradient if we have no active
+        one to use.
+
 2016-10-10  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebCore/platform/graphics/Image.cpp

@@ -94 +94 @@
 void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, CompositeOperator op, BlendMode blendMode)
 {
-#if USE(DIRECT2D)
-    notImplemented();
-#else
     Color color = singlePixelSolidColor();
     if (color.isValid()) {
@@ -204 +201 @@
     startAnimation();
 #endif
-#endif
 }
 

trunk/Source/WebCore/platform/graphics/win/GradientDirect2D.cpp

@@ -68 +68 @@
 
     if (m_radial) {
+        FloatSize offset = p1() - p0();
         ID2D1RadialGradientBrush* radialGradient = nullptr;
+        float radiusX = endRadius() + offset.width();
+        float radiusY = radiusX / m_aspectRatio;
         hr = renderTarget->CreateRadialGradientBrush(
-            D2D1::RadialGradientBrushProperties(p0(), p1(), startRadius(), endRadius()),
+            D2D1::RadialGradientBrushProperties(p0(), D2D1::Point2F(offset.width(), offset.height()), radiusX, radiusY),
             D2D1::BrushProperties(), gradientStopCollection.get(),
             &radialGradient);
@@ -110 +113 @@
     }
 
-    if (!m_cachedHash)
+    if (!m_cachedHash || !m_gradient)
         generateGradient(d2dContext);