From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 29 Sep 2010 17:32:26 +0100
Subject: Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
---
 WebCore/platform/graphics/Gradient.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/platform/graphics/Gradient.h')

diff --git a/WebCore/platform/graphics/Gradient.h b/WebCore/platform/graphics/Gradient.h
index c4ac01b..0a69fa2 100644
--- a/WebCore/platform/graphics/Gradient.h
+++ b/WebCore/platform/graphics/Gradient.h
@@ -101,7 +101,7 @@ namespace WebCore {
         const FloatPoint& p1() const { return m_p1; }
         float r0() const { return m_r0; }
         float r1() const { return m_r1; }
-        const Vector<ColorStop>& getStops() const;
+        const Vector<ColorStop, 2>& getStops() const;
 #else
 #if PLATFORM(ANDROID)
         SkShader* getShader(SkShader::TileMode);
@@ -150,7 +150,7 @@ namespace WebCore {
         FloatPoint m_p1;
         float m_r0;
         float m_r1;
-        mutable Vector<ColorStop> m_stops;
+        mutable Vector<ColorStop, 2> m_stops;
         mutable bool m_stopsSorted;
         mutable int m_lastStop;
         GradientSpreadMethod m_spreadMethod;
-- 
cgit v1.1