Move "stops sort" before first usage of m_stops.

Fixes: LayoutTests/fast/canvas/fillrect_gradient.html
Note: That test is fixed now, but it still won't pass because the baseline is actually wrong; a new baseline is on the way.

Review URL: http://codereview.chromium.org/14404


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6987 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/webkit/port/platform/graphics/skia/GradientSkia.cpp b/webkit/port/platform/graphics/skia/GradientSkia.cpp
index 8a5c7c0..1c33164 100644
--- a/webkit/port/platform/graphics/skia/GradientSkia.cpp
+++ b/webkit/port/platform/graphics/skia/GradientSkia.cpp
@@ -113,6 +113,13 @@ SkShader* Gradient::platformGradient()
     if (m_gradient)

         return m_gradient;

 

+    // TODO: This and compareStops() are also in Gradient.cpp and

+    // CSSGradientValue.cpp; probably should refactor in WebKit.

+    if (!m_stopsSorted) {

+        if (m_stops.size())

+            std::stable_sort(m_stops.begin(), m_stops.end(), compareStops);

+        m_stopsSorted = true;

+    }

     size_t count_used = total_stops_needed(m_stops.data(), m_stops.size());

     ASSERT(count_used >= 2);

     ASSERT(count_used >= m_stops.size());

@@ -122,13 +129,6 @@ SkShader* Gradient::platformGradient()
     SkColor* colors = (SkColor*)storage.get();

     SkScalar* pos = (SkScalar*)(colors + count_used);

 

-    // TODO: This and compareStops() are also in Gradient.cpp and

-    // CSSGradientValue.cpp; probably should refactor in WebKit.

-    if (!m_stopsSorted) {

-        if (m_stops.size())

-            std::stable_sort(m_stops.begin(), m_stops.end(), compareStops);

-        m_stopsSorted = true;

-    }

     fill_stops(m_stops.data(), m_stops.size(), pos, colors);

 

     if (m_radial) {