diff options
author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/graphics/Gradient.h | |
parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/graphics/Gradient.h')
-rw-r--r-- | WebCore/platform/graphics/Gradient.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/Gradient.h b/WebCore/platform/graphics/Gradient.h index 764deee..074c99d 100644 --- a/WebCore/platform/graphics/Gradient.h +++ b/WebCore/platform/graphics/Gradient.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2007 Alp Toker <alp@atoker.com> + * Copyright (C) 2008 Torch Mobile, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -76,12 +77,28 @@ namespace WebCore { void getColor(float value, float* r, float* g, float* b, float* a) const; +#ifdef MANUAL_MERGE_REQUIRED #if PLATFORM(SGL) SkShader* getShader(SkShader::TileMode); #else +#else // MANUAL_MERGE_REQUIRED +#if PLATFORM(WINCE) && !PLATFORM(QT) + const FloatPoint& p0() const { return m_p0; } + const FloatPoint& p1() const { return m_p1; } + float r0() const { return m_r0; } + float r1() const { return m_r1; } + bool isRadial() const { return m_radial; } + struct ColorStop; + const Vector<ColorStop>& getStops() const; +#else +#endif // MANUAL_MERGE_REQUIRED PlatformGradient platformGradient(); +#ifdef MANUAL_MERGE_REQUIRED #endif +#else // MANUAL_MERGE_REQUIRED +#endif +#endif // MANUAL_MERGE_REQUIRED struct ColorStop { float stop; float red; @@ -97,11 +114,12 @@ namespace WebCore { void setSpreadMethod(GradientSpreadMethod); GradientSpreadMethod spreadMethod() { return m_spreadMethod; } - void setGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation) { m_gradientSpaceTransformation = gradientSpaceTransformation; } + void setGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation); // Qt and CG transform the gradient at draw time TransformationMatrix gradientSpaceTransform() { return m_gradientSpaceTransformation; } virtual void fill(GraphicsContext*, const FloatRect&); + void setPlatformGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation); private: Gradient(const FloatPoint& p0, const FloatPoint& p1); |