Changeset 19675 for trunk/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

Timestamp:

02/16/07 22:33:26 (23 months ago)

Author:

kjk

Message:

Reviewed by Adam Roben.

Move Path implementation from TemporaryLinkStubs.cpp to
its own file.
Implement setLineCap, setLineJoin and setMiterLimit for
cairo's GraphicsContext.

• WebCoreSources.bkl:
• platform/gdk/TemporaryLinkStubs.cpp:
• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::setPlatformFillColor): (WebCore::GraphicsContext::setPlatformStrokeColor): (WebCore::GraphicsContext::setLineCap): (WebCore::GraphicsContext::setLineJoin): (WebCore::GraphicsContext::setMiterLimit):
• platform/graphics/cairo/PathCairo.cpp: Added. (WebCore::Path::Path): (WebCore::Path::~Path): (WebCore::Path::contains): (WebCore::Path::translate): (WebCore::Path::boundingRect): (WebCore::Path::operator=): (WebCore::Path::clear): (WebCore::Path::moveTo): (WebCore::Path::addLineTo): (WebCore::Path::addQuadCurveTo): (WebCore::Path::addBezierCurveTo): (WebCore::Path::addArcTo): (WebCore::Path::closeSubpath): (WebCore::Path::addArc): (WebCore::Path::addRect): (WebCore::Path::addEllipse): (WebCore::Path::transform): (WebCore::Path::apply):

Files:

• trunk/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (3 diffs)

trunk/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -478 +478 @@
 {
     // FIXME: this is probably a no-op but I'm not sure
-    notImplemented();
+    // notImplemented(); // commented-out because it's chatty and clutters output
 }
 
@@ -484 +484 @@
 {
     // FIXME: this is probably a no-op but I'm not sure
-    notImplemented();
+    //notImplemented(); // commented-out because it's chatty and clutters output
 }
 
@@ -579 +579 @@
 }
 
-void GraphicsContext::setLineCap(LineCap)
-{
-    notImplemented();
-}
-
-void GraphicsContext::setLineJoin(LineJoin)
-{
-    notImplemented();
-}
-
-void GraphicsContext::setMiterLimit(float)
-{
-    notImplemented();
+void GraphicsContext::setLineCap(LineCap lineCap)
+{
+    if (paintingDisabled())
+        return;
+
+    cairo_line_cap_t cairoCap = CAIRO_LINE_CAP_BUTT;
+    switch (lineCap) {
+        case ButtCap:
+            // no-op
+            break;
+        case RoundCap:
+            cairoCap = CAIRO_LINE_CAP_ROUND;
+            break;
+        case SquareCap:
+            cairoCap = CAIRO_LINE_CAP_SQUARE;
+            break;
+    }
+    cairo_set_line_cap(m_data->context, cairoCap);
+}
+
+void GraphicsContext::setLineJoin(LineJoin lineJoin)
+{
+    if (paintingDisabled())
+        return;
+
+    cairo_line_join_t cairoJoin = CAIRO_LINE_JOIN_MITER;
+    switch (lineJoin) {
+        case MiterJoin:
+            // no-op
+            break;
+        case RoundJoin:
+            cairoJoin = CAIRO_LINE_JOIN_ROUND;
+            break;
+        case BevelJoin:
+            cairoJoin = CAIRO_LINE_JOIN_BEVEL;
+            break;
+    }
+    cairo_set_line_join(m_data->context, cairoJoin);
+}
+
+void GraphicsContext::setMiterLimit(float miter)
+{
+    if (paintingDisabled())
+        return;
+    cairo_set_miter_limit(m_data->context, miter);
 }