Changeset 65783 in webkit

Timestamp:

Aug 22, 2010 1:38:25 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-08-22 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Ariya Hidayat.

[Qt] Gradient: Support inner radius larger than outer radius
​https://bugs.webkit.org/show_bug.cgi?id=44392

• platform/graphics/qt/GradientQt.cpp: (WebCore::Gradient::platformGradient): Reverse the (radial) gradient if r0 > r1.

2010-08-22 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Ariya Hidayat.

[Qt] Gradient: Support inner radius larger than outer radius
​https://bugs.webkit.org/show_bug.cgi?id=44392

Unskip two tests that now pass:

• canvas/philip/tests/2d.gradient.radial.outside2.html
• canvas/philip/tests/2d.gradient.radial.outside3.html

• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/GradientQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-22  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Gradient: Support inner radius larger than outer radius
+        https://bugs.webkit.org/show_bug.cgi?id=44392
+
+        Unskip two tests that now pass:
+        - canvas/philip/tests/2d.gradient.radial.outside2.html
+        - canvas/philip/tests/2d.gradient.radial.outside3.html
+
+        * platform/qt/Skipped:
+
 2010-08-21  Eric Carlson  <eric.carlson@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5231 +5231 @@
 canvas/philip/tests/2d.gradient.radial.cone.top.html
 canvas/philip/tests/2d.gradient.radial.negative.html
-canvas/philip/tests/2d.gradient.radial.outside2.html
-canvas/philip/tests/2d.gradient.radial.outside3.html
 canvas/philip/tests/2d.gradient.radial.touch1.html
 canvas/philip/tests/2d.gradient.radial.touch2.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-22  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Gradient: Support inner radius larger than outer radius
+        https://bugs.webkit.org/show_bug.cgi?id=44392
+
+        * platform/graphics/qt/GradientQt.cpp:
+        (WebCore::Gradient::platformGradient): Reverse the (radial) gradient if r0 > r1.
+
 2010-08-22  Ariya Hidayat  <ariya@sencha.com>
 

trunk/WebCore/platform/graphics/qt/GradientQt.cpp

@@ -47 +47 @@
         return m_gradient;
 
+    bool reversed = m_r0 > m_r1;
+
+    qreal innerRadius = reversed ? m_r1 : m_r0;
+    qreal outerRadius = reversed ? m_r0 : m_r1;
+    QPointF center = reversed ? m_p0 : m_p1;
+    QPointF focalPoint = reversed ? m_p1 : m_p0;
+
     if (m_radial)
-        m_gradient = new QRadialGradient(m_p1.x(), m_p1.y(), m_r1, m_p0.x(), m_p0.y());
+        m_gradient = new QRadialGradient(center, outerRadius, focalPoint);
     else
         m_gradient = new QLinearGradient(m_p0.x(), m_p0.y(), m_p1.x(), m_p1.y());
@@ -66 +73 @@
         else
             lastStop = stopIterator->stop;
-        if (m_radial && m_r0)
-            lastStop = m_r0 / m_r1 + lastStop * (1.0f - m_r0 / m_r1);
-        m_gradient->setColorAt(qMin(lastStop, qreal(1.0f)), stopColor);
+
+        if (m_radial && !qFuzzyCompare(1 + outerRadius, qreal(1))) {
+            lastStop = lastStop * (1.0f - innerRadius / outerRadius);
+            if (!reversed)
+                lastStop += innerRadius / outerRadius;
+        }
+
+        qreal stopPosition = qMin(lastStop, qreal(1.0f));
+
+        if (m_radial && reversed)
+            stopPosition = 1 - stopPosition;
+
+        m_gradient->setColorAt(stopPosition, stopColor);
         // Keep the lastStop as orginal value, since the following stopColor depend it
         lastStop = stopIterator->stop;