Changeset 18306 in webkit

Timestamp:

Dec 19, 2006 12:54:00 AM (17 years ago)

Author:

hyatt

Message:

Convert stroke thickness to a float. This allows the thickness argument to strokeArc to be eliminated.

Reviewed by olliej

• platform/graphics/GraphicsContext.cpp: (WebCore::GraphicsContext::setStrokeThickness): (WebCore::GraphicsContext::strokeThickness): (WebCore::GraphicsContext::setPlatformStrokeThickness):
• platform/graphics/GraphicsContext.h:
• platform/graphics/cg/GraphicsContextCG.cpp: (WebCore::GraphicsContext::drawEllipse): (WebCore::GraphicsContext::strokeArc):
• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::strokeArc): (WebCore::GraphicsContext::setPlatformStrokeThickness):
• rendering/RenderObject.cpp: (WebCore::RenderObject::drawBorderArc):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (4 diffs)
• platform/graphics/GraphicsContext.h (modified) (3 diffs)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (3 diffs)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-12-19  David Hyatt  <hyatt@apple.com>
+
+        Convert stroke thickness to a float.  This allows the thickness argument to strokeArc to be eliminated.
+       
+        Reviewed by olliej
+
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::setStrokeThickness):
+        (WebCore::GraphicsContext::strokeThickness):
+        (WebCore::GraphicsContext::setPlatformStrokeThickness):
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::drawEllipse):
+        (WebCore::GraphicsContext::strokeArc):
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::strokeArc):
+        (WebCore::GraphicsContext::setPlatformStrokeThickness):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::drawBorderArc):
+
 2006-12-19  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/graphics/GraphicsContext.cpp

@@ -46 +46 @@
     Font font;
     StrokeStyle strokeStyle;
-    unsigned strokeThickness;
+    float strokeThickness;
     Color strokeColor;
     Color fillColor;
@@ -118 +118 @@
 }
 
-void GraphicsContext::setStrokeThickness(unsigned thickness)
+void GraphicsContext::setStrokeThickness(float thickness)
 {
     m_common->state.strokeThickness = thickness;
@@ -136 +136 @@
 }
 
-unsigned GraphicsContext::strokeThickness() const
+float GraphicsContext::strokeThickness() const
 {
     return m_common->state.strokeThickness;
@@ -352 +352 @@
 }
 
-void GraphicsContext::setPlatformStrokeThickness(unsigned)
+void GraphicsContext::setPlatformStrokeThickness(float)
 {
 }

trunk/WebCore/platform/graphics/GraphicsContext.h

@@ -88 +88 @@
         void setFont(const Font&);
         
-        unsigned strokeThickness() const;
-        void setStrokeThickness(unsigned);
+        float strokeThickness() const;
+        void setStrokeThickness(float);
         StrokeStyle strokeStyle() const;
         void setStrokeStyle(const StrokeStyle& style);
@@ -107 +107 @@
         void drawConvexPolygon(size_t numPoints, const FloatPoint*, bool shouldAntialias = false);
 
-        // Arc drawing (used by border-radius in CSS) just supports stroking at the moment.  It ignores
-        // the stroke thickness, relying instead on a passed-in argument (because of float vs. int issues).
-        // FIXME: Reconcile this method with stroke thickness by converting stroke thickness to a float.
-        void strokeArc(const IntRect&, float thickness, int startAngle, int angleSpan);
+        // Arc drawing (used by border-radius in CSS) just supports stroking at the moment.
+        void strokeArc(const IntRect&, int startAngle, int angleSpan);
         
         void fillRect(const IntRect&, const Color&);
@@ -207 +205 @@
         void setPlatformStrokeColor(const Color&);
         void setPlatformStrokeStyle(const StrokeStyle&);
-        void setPlatformStrokeThickness(unsigned);
+        void setPlatformStrokeThickness(float);
         void setPlatformFillColor(const Color&);
         void setPlatformFont(const Font& font);

trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -267 +267 @@
         if (strokeStyle() != NoStroke) {
             // stroke and fill
-            unsigned penWidth = max(strokeThickness(), 1U);
-            CGContextSetLineWidth(context, penWidth);
+            unsigned strokeWidth = max(strokeThickness(), 1.0f);
+            CGContextSetLineWidth(context, strokeWidth);
             CGContextDrawPath(context, kCGPathFillStroke);
         } else
             CGContextFillPath(context);
     } else if (strokeStyle() != NoStroke) {
-        unsigned penWidth = max(strokeThickness(), 1U);
-        CGContextSetLineWidth(context, penWidth);
+        unsigned strokeWidth = max(strokeThickness(), 1.0f);
+        CGContextSetLineWidth(context, strokeWidth);
         CGContextStrokePath(context);
     }
@@ -280 +280 @@
 
 
-void GraphicsContext::strokeArc(const IntRect& rect, float thickness, int startAngle, int angleSpan)
+void GraphicsContext::strokeArc(const IntRect& rect, int startAngle, int angleSpan)
 { 
-    if (paintingDisabled() || strokeStyle() == NoStroke || thickness <= 0.0f || !strokeColor().alpha())
+    if (paintingDisabled() || strokeStyle() == NoStroke || strokeThickness() <= 0.0f || !strokeColor().alpha())
         return;
     
@@ -312 +312 @@
     
     
-    float width = max(thickness,  1.0f);
+    float width = max(strokeThickness(),  1.0f);
     int patWidth = 0;
     

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -440 +440 @@
 }
 
-void GraphicsContext::strokeArc(const IntRect& rect, float thickness, int startAngle, int angleSpan)
-{
-    if (paintingDisabled() || strokeStyle() == NoStroke || thickness <= 0.0f || !strokeColor().alpha())
-        return;
-
-    const QPen oldPen = m_data->p().pen();
-    QPen nPen = oldPen;
-    nPen.setWidthF(thickness);
-    m_data->p().setPen(nPen);
+void GraphicsContext::strokeArc(const IntRect& rect, int startAngle, int angleSpan)
+{
+    if (paintingDisabled() || strokeStyle() == NoStroke || strokeThickness() <= 0.0f || !strokeColor().alpha())
+        return;
+
     m_data->p().drawArc(rect, startAngle, angleSpan);
-    m_data->p().setPen(oldPen);
 }
 
@@ -856 +851 @@
 }
 
-void GraphicsContext::setPlatformStrokeThickness(unsigned thickness)
+void GraphicsContext::setPlatformStrokeThickness(float thickness)
 {
     QPen newPen(m_data->p().pen());
-    newPen.setWidth(thickness);
+    newPen.setWidthF(thickness);
     m_data->p().setPen(newPen);
 }

trunk/WebCore/rendering/RenderObject.cpp

@@ -878 +878 @@
             graphicsContext->setStrokeColor(c);
             graphicsContext->setStrokeStyle(style == DOTTED ? DottedStroke : DashedStroke);
-            graphicsContext->strokeArc(IntRect(x, y, radius.width() * 2, radius.height() * 2), thickness, angleStart, angleSpan);
+            graphicsContext->setStrokeThickness(thickness);
+            graphicsContext->strokeArc(IntRect(x, y, radius.width() * 2, radius.height() * 2), angleStart, angleSpan);
             break;
         case DOUBLE: {
@@ -897 +898 @@
 
             graphicsContext->setStrokeStyle(SolidStroke);
-            graphicsContext->strokeArc(IntRect(x, outerY, radius.width() * 2, outerHeight), third, angleStart, angleSpan);
-            graphicsContext->strokeArc(IntRect(innerX, innerY, innerWidth, innerHeight), (innerThird > 2) ? innerThird - 1 : innerThird,
-                                     angleStart, angleSpan);
+            graphicsContext->setStrokeColor(c);
+            graphicsContext->setStrokeThickness(third);
+            graphicsContext->strokeArc(IntRect(x, outerY, radius.width() * 2, outerHeight), angleStart, angleSpan);
+            graphicsContext->setStrokeThickness(innerThird > 2 ? innerThird - 1 : innerThird);
+            graphicsContext->strokeArc(IntRect(innerX, innerY, innerWidth, innerHeight), angleStart, angleSpan);
             break;
         }
@@ -915 +918 @@
             graphicsContext->setStrokeStyle(SolidStroke);
             graphicsContext->setStrokeColor(c);
-            graphicsContext->strokeArc(IntRect(x, y, radius.width() * 2, radius.height() * 2), thickness, angleStart, angleSpan);
+            graphicsContext->setStrokeThickness(thickness);
+            graphicsContext->strokeArc(IntRect(x, y, radius.width() * 2, radius.height() * 2), angleStart, angleSpan);
 
             float halfThickness = (thickness + 1.0f) / 4.0f;
             int shiftForInner = static_cast<int>(halfThickness * 1.5f);
             graphicsContext->setStrokeColor(c2);
+            graphicsContext->setStrokeThickness(halfThickness > 2 ? halfThickness - 1 : halfThickness);
             graphicsContext->strokeArc(IntRect(x + shiftForInner, y + shiftForInner, (radius.width() - shiftForInner) * 2,
-                                     (radius.height() - shiftForInner) * 2), (halfThickness > 2) ? halfThickness - 1 : halfThickness,
-                                     angleStart, angleSpan);
+                                       (radius.height() - shiftForInner) * 2), angleStart, angleSpan);
             break;
         }
@@ -934 +938 @@
             graphicsContext->setStrokeStyle(SolidStroke);
             graphicsContext->setStrokeColor(c);
-            graphicsContext->strokeArc(IntRect(x, y, radius.width() * 2, radius.height() * 2), thickness, angleStart, angleSpan);
+            graphicsContext->setStrokeThickness(thickness);
+            graphicsContext->strokeArc(IntRect(x, y, radius.width() * 2, radius.height() * 2), angleStart, angleSpan);
             break;
     }