Changeset 437 for trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCGraphicsContextCairo.cpp

Timestamp:

08/15/08 13:25:16 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35774

Files:

• trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCGraphicsContextCairo.cpp (modified) (3 diffs)

trunk/BAL/WKAL/Concretizations/Graphics/Cairo/BCGraphicsContextCairo.cpp

@@ -38 +38 @@
-#include "NotImplemented.h"
-#include "Path.h"
+#include "Pattern.h"
-#include "SimpleFontData.h"
+
-#include <cairo.h>
-#include <math.h>
@@ -494 +496 @@
-    cairo_get_matrix(cr, &matrix);
-    return IntPoint(static_cast<int>(matrix.x0), static_cast<int>(matrix.y0));
+}
+
+void GraphicsContext::applyStrokePattern(const Pattern& pattern)
+{
+    cairo_pattern_t* platformPattern = pattern.createPlatformPattern(getCTM());
+    if (!platformPattern)
+        return;
+
+    cairo_set_source(platformContext(), platformPattern);
+    cairo_pattern_destroy(platformPattern);
+}
+
+void GraphicsContext::applyFillPattern(const Pattern& pattern)
+{
+    // The Cairo codepath doesn't seem to support separate stroke/fill?
+    // The code I refactored to create these methods was identical for Cairo
+    applyStrokePattern(pattern);
-}
-
@@ -880 +899 @@
-    return GDK_DRAWABLE(m_data->expose->window);
-}
-
-IntPoint GraphicsContext::translatePoint(const IntPoint& point) const
-{
-    cairo_matrix_t tm;
-    cairo_get_matrix(m_data->cr, &tm);
-    double x = point.x();
-    double y = point.y();
-
-    cairo_matrix_transform_point(&tm, &x, &y);
-    return IntPoint(x, y);
-}
-#endif
-