Remove duplicate implementation of drawEllipse and some related PLATFORM(IOS) ifdefs

[WebKit-https.git] / Source / WebCore / platform / graphics / cg / GraphicsContextCG.cpp

diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index b0a05d599c8c205d96970ce96d54f0888096a001..7a2fa24c851d342d34a3c180d6559602b72e9265 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -134,6 +134,7 @@ void GraphicsContext::platformInit(CGContextRef cgContext, bool shouldUseContext
         // Make sure the context starts in sync with our state.
         setPlatformFillColor(fillColor(), fillColorSpace());
         setPlatformStrokeColor(strokeColor(), strokeColorSpace());
+        setPlatformStrokeThickness(strokeThickness());
 #if PLATFORM(IOS)
         }
 #endif
@@ -456,8 +457,7 @@ void GraphicsContext::drawJoinedLines(CGPoint points[], unsigned count, bool ant
 }
 #endif
 
-// This method is only used to draw the little circles used in lists.
-void GraphicsContext::drawEllipse(const IntRect& rect)
+void GraphicsContext::drawEllipse(const FloatRect& rect)
 {
     if (paintingDisabled())
         return;
@@ -467,31 +467,6 @@ void GraphicsContext::drawEllipse(const IntRect& rect)
     drawPath(path);
 }
 
-#if PLATFORM(IOS)
-void GraphicsContext::drawEllipse(const FloatRect& rect)
-{
-    if (paintingDisabled())
-        return;
-
-    CGContextRef context(platformContext());
-
-    CGContextSaveGState(context);
-
-    setCGFillColor(context, fillColor(), fillColorSpace());
-    setCGStrokeColor(context, strokeColor(), strokeColorSpace());
-
-    CGContextSetLineWidth(context, strokeThickness());
-    
-    CGContextBeginPath(context);
-    CGContextAddEllipseInRect(context, rect);
-
-    CGContextFillPath(context);
-    CGContextStrokePath(context);
-    
-    CGContextRestoreGState(context);
-}
-#endif
-
 static void addConvexPolygonToPath(Path& path, size_t numberOfPoints, const FloatPoint* points)
 {
     ASSERT(numberOfPoints > 0);