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

Timestamp:

04/23/07 00:13:21 (21 months ago)

Author:

bdash

Message:

2007-04-23 Alp Toker <alp@atoker.com>

Reviewed by Hyatt.

• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::drawEllipse): (WebCore::GraphicsContext::drawConvexPolygon): Fix stroking and filling of ellipses and polygons.
• platform/graphics/cairo/ImageCairo.cpp: (WebCore::BitmapImage::draw): Make use of a new GraphicsContext function to simplify the code. (WebCore::Image::drawPattern): Now implemented. This makes content with tiled patterns (eg. CSS repeat) render correctly.
• platform/graphics/gdk/ImageGdk.cpp: (WebCore::Image::drawPattern): Remove old stub.

Files:

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

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

@@ -1 +1 @@
 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -292 +293 @@
     if (fillColor().alpha()) {
         setColor(context, fillColor());
-        cairo_fill(context);
-    }
+        cairo_fill_preserve(context);
+    }
+
     if (strokeStyle() != NoStroke) {
         setColor(context, strokeColor());
@@ -299 +301 @@
         cairo_stroke(context);
     }
+
+    cairo_new_path(context);
 }
 
@@ -348 +352 @@
         setColor(context, fillColor());
         cairo_set_fill_rule(context, CAIRO_FILL_RULE_EVEN_ODD);
-        cairo_fill(context);
+        cairo_fill_preserve(context);
     }
 
@@ -356 +360 @@
         cairo_stroke(context);
     }
+
+    cairo_new_path(context);
     cairo_restore(context);
 }