Merge change Ie9bc2064 into eclair-mr2

* changes:
  Remove the Android-specific setCMYKXXXColor methods, which are not used.

2 files changed, 0 insertions, 21 deletions

diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index 5b62b2c..3ffc211 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -204,10 +204,6 @@ namespace WebCore {
 #endif
 
 #if PLATFORM(SGL)
-        /* these should be pused to apple. needed for CanvasStyle.cpp */
-        void setCMYKAFillColor(float c, float m, float y, float k, float a);
-        void setCMYKAStrokeColor(float c, float m, float y, float k, float a);
-        
         // initialize a paint for bitmaps
         void setupBitmapPaint(SkPaint*);
         // initialize a paint for filling
@@ -469,4 +465,3 @@ namespace WebCore {
 } // namespace WebCore
 
 #endif // GraphicsContext_h
-
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 3acc3fa..b480e2c 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -858,22 +858,6 @@ void GraphicsContext::endTransparencyLayer()
     bool GraphicsContext::setupShadowPaint(SkPaint* paint, SkPoint* offset) {
         return m_data->mState->setupShadowPaint(paint, offset);
     }
-        
-    // referenced from CanvasStyle.cpp
-    void GraphicsContext::setCMYKAFillColor(float c, float m, float y, float k, float a) {
-        float r = 1 - (c + k);
-        float g = 1 - (m + k);
-        float b = 1 - (y + k);
-        return this->setFillColor(Color(r, g, b, a));
-    }
-
-    // referenced from CanvasStyle.cpp
-    void GraphicsContext::setCMYKAStrokeColor(float c, float m, float y, float k, float a) {
-        float r = 1 - (c + k);
-        float g = 1 - (m + k);
-        float b = 1 - (y + k);
-        return this->setStrokeColor(Color(r, g, b, a));
-    }
 
     void GraphicsContext::setPlatformStrokeColor(const Color& c) {
         m_data->setStrokeColor(c);