Changeset 21022 for trunk/WebCore/platform/graphics/cairo/ImageCairo.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/ImageCairo.cpp (modified) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (C) 2004, 2005, 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
@@ -29 +30 @@
 #if PLATFORM(CAIRO)
 
+#include "AffineTransform.h"
 #include "FloatRect.h"
 #include "GraphicsContext.h"
@@ -52 +54 @@
 // Drawing Routines
 
-static void setCompositingOperation(cairo_t* context, CompositeOperator op, bool hasAlpha)
-{
-    // FIXME: Add support for more operators.
-    // FIXME: This should really move to be a graphics context function once we have
-    // a C++ abstraction for GraphicsContext.
-    if (op == CompositeSourceOver && !hasAlpha)
-        op = CompositeCopy;
-
-    if (op == CompositeCopy)
-        cairo_set_operator(context, CAIRO_OPERATOR_SOURCE);
-    else
-        cairo_set_operator(context, CAIRO_OPERATOR_OVER);
-}
-
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, const FloatRect& src, CompositeOperator op)
 {
@@ -84 +72 @@
 
     // Set the compositing operation.
-    setCompositingOperation(context, op, frameHasAlphaAtIndex(m_currentFrame));
-    
+    if (op == CompositeSourceOver && !frameHasAlphaAtIndex(m_currentFrame))
+        ctxt->setCompositeOperation(CompositeCopy);
+    else
+        ctxt->setCompositeOperation(op);
+
     // If we're drawing a sub portion of the image or scaling then create
     // a pattern transformation on the image and draw the transformed pattern.
@@ -108 +99 @@
 }
 
+void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const AffineTransform& patternTransform,
+                        const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect)
+{
+    cairo_surface_t* image = nativeImageForCurrentFrame();
+    if (!image) // If it's too early we won't have an image yet.
+        return;
+
+    cairo_t* context = ctxt->platformContext();
+    ctxt->save();
+
+    // TODO: Make use of tileRect.
+
+    cairo_pattern_t* pattern = cairo_pattern_create_for_surface(image);
+    cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
+
+    cairo_matrix_t pattern_matrix = cairo_matrix_t(patternTransform);
+    cairo_matrix_t phase_matrix = {1, 0, 0, 1, phase.x(), phase.y()};
+    cairo_matrix_t combined;
+    cairo_matrix_multiply(&combined, &pattern_matrix, &phase_matrix);
+    cairo_matrix_invert(&combined);
+    cairo_pattern_set_matrix(pattern, &combined);
+
+    ctxt->setCompositeOperation(op);
+    cairo_set_source(context, pattern);
+    cairo_rectangle(context, destRect.x(), destRect.y(), destRect.width(), destRect.height());
+    cairo_fill(context);
+
+    cairo_pattern_destroy(pattern);
+    ctxt->restore();
+}
+
 void BitmapImage::checkForSolidColor()
 {