2007-01-09 Mark Rowe <mrowe@apple.com>

        Reviewed by Tim H.

        Build fix for 64-bit platforms.

        * platform/graphics/svg/SVGPaintServerGradient.h:
        * platform/graphics/svg/cg/SVGPaintServerGradientCg.cpp:
        (WebCore::SVGPaintServerGradient::updateQuartzGradientStopsCache):


git-svn-id: svn://svn.chromium.org/blink/trunk@18695 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2007-01-09  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Tim H.
+
+        Build fix for 64-bit platforms.
+
+        * platform/graphics/svg/SVGPaintServerGradient.h:
+        * platform/graphics/svg/cg/SVGPaintServerGradientCg.cpp:
+        (WebCore::SVGPaintServerGradient::updateQuartzGradientStopsCache):
+
 2007-01-08  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Brady.

third_party/WebKit/WebCore/platform/graphics/svg/SVGPaintServerGradient.h

@@ -48,7 +48,12 @@ namespace WebCore {
         SPREADMETHOD_REPEAT = 3
     };
 
+#if PLATFORM(CG)
+    typedef std::pair<CGFloat, Color> SVGGradientStop;
+#else
     typedef std::pair<float, Color> SVGGradientStop;
+#endif
+
 
     class SVGPaintServerGradient : public SVGPaintServer {
     public:

third_party/WebKit/WebCore/platform/graphics/svg/cg/SVGPaintServerGradientCg.cpp

@@ -129,7 +129,7 @@ void SVGPaintServerGradient::updateQuartzGradientStopsCache(const Vector<SVGGrad
 
     CGFloat previousOffset = 0.0;
     for (unsigned i = 0; i < stops.size(); ++i) {
-        CGFloat currOffset = min(max(stops[i].first, previousOffset), 1.0f);
+        CGFloat currOffset = min(max(stops[i].first, previousOffset), static_cast<CGFloat>(1.0));
         m_stopsCache[i].offset = currOffset;
         m_stopsCache[i].previousDeltaInverse = 1.0 / (currOffset - previousOffset);
         previousOffset = currOffset;