Changeset 79950 in webkit

Timestamp:

Feb 28, 2011 5:33:49 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-28 Noel Gordon <​noel.gordon@gmail.com>

Reviewed by James Robinson.

[chromium] GradientSkia: use the common Gradient stop sorting methods.
​https://bugs.webkit.org/show_bug.cgi?id=54625

Remove a FIXME: call the Gradient.cpp stop storting routines, no need
to duplicate that code herein.

No change in behavior, so no new tests.

• platform/graphics/skia/GradientSkia.cpp: (WebCore::Gradient::platformGradient):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/GradientSkia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Noel Gordon  <noel.gordon@gmail.com>
+        Reviewed by James Robinson.
+
+        [chromium] GradientSkia: use the common Gradient stop sorting methods.
+        https://bugs.webkit.org/show_bug.cgi?id=54625
+
+        Remove a FIXME: call the Gradient.cpp stop storting routines, no need
+        to duplicate that code herein.
+
+        No change in behavior, so no new tests.
+
+        * platform/graphics/skia/GradientSkia.cpp:
+        (WebCore::Gradient::platformGradient):
+
 2011-02-28  Steve Block  <steveblock@google.com>
 

trunk/Source/WebCore/platform/graphics/skia/GradientSkia.cpp

@@ -111 +111 @@
 }
 
-static inline bool compareStops(const Gradient::ColorStop& a, const Gradient::ColorStop& b)
-{
-    return a.stop < b.stop;
-}
-
 SkShader* Gradient::platformGradient()
 {
@@ -121 +116 @@
         return m_gradient;
 
-    // FIXME: 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;
-    }
+    sortStopsIfNecessary();
+    ASSERT(m_stopsSorted);
 
     size_t countUsed = totalStopsNeeded(m_stops.data(), m_stops.size());