Changeset 214763 in webkit

Timestamp:

Apr 3, 2017 3:29:39 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214100 - [Cairo] Handle the blend mode in GraphicsContext::drawPattern
​https://bugs.webkit.org/show_bug.cgi?id=169746

Reviewed by Žan Doberšek.

We are not taking into account the blend mode when passing the cairo operator to drawPatternToCairoContext().
This is based on patch by Žan Doberšek, just adding the toCairoOperator changes to make it easier to handle
it. Instead of checking everywhere if blend mode is Normal to decide whether to use toCairoOperator with
CompositeOperator or BlendMode, there's no a single toCairoOperator that receives both parameters, but BlendMode
is optional and defaults to Normal.

• platform/graphics/cairo/CairoUtilities.cpp:

(WebCore::toCairoCompositeOperator):
(WebCore::toCairoOperator):

• platform/graphics/cairo/CairoUtilities.h:
• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::GraphicsContext::setPlatformCompositeOperation):
(WebCore::GraphicsContext::drawPattern):

Location:

releases/WebKitGTK/webkit-2.16/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/CairoUtilities.cpp (modified) (2 diffs)
• platform/graphics/cairo/CairoUtilities.h (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [Cairo] Handle the blend mode in GraphicsContext::drawPattern
+        https://bugs.webkit.org/show_bug.cgi?id=169746
+
+        Reviewed by Žan Doberšek.
+
+        We are not taking into account the blend mode when passing the cairo operator to drawPatternToCairoContext().
+        This is based on patch by Žan Doberšek, just adding the toCairoOperator changes to make it easier to handle
+        it. Instead of checking everywhere if blend mode is Normal to decide whether to use toCairoOperator with
+        CompositeOperator or BlendMode, there's no a single toCairoOperator that receives both parameters, but BlendMode
+        is optional and defaults to Normal.
+
+        * platform/graphics/cairo/CairoUtilities.cpp:
+        (WebCore::toCairoCompositeOperator):
+        (WebCore::toCairoOperator):
+        * platform/graphics/cairo/CairoUtilities.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::setPlatformCompositeOperation):
+        (WebCore::GraphicsContext::drawPattern):
+
 2017-03-16  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp

@@ -109 +109 @@
 }
 
-cairo_operator_t toCairoOperator(CompositeOperator op)
+static cairo_operator_t toCairoCompositeOperator(CompositeOperator op)
 {
     switch (op) {
@@ -144 +144 @@
     }
 }
-cairo_operator_t toCairoOperator(BlendMode blendOp)
+
+cairo_operator_t toCairoOperator(CompositeOperator op, BlendMode blendOp)
 {
     switch (blendOp) {
     case BlendModeNormal:
-        return CAIRO_OPERATOR_OVER;
+        return toCairoCompositeOperator(op);
     case BlendModeMultiply:
         return CAIRO_OPERATOR_MULTIPLY;

releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/cairo/CairoUtilities.h

@@ -80 +80 @@
 void appendWebCorePathToCairoContext(cairo_t* context, const Path& path);
 void appendRegionToCairoContext(cairo_t*, const cairo_region_t*);
-cairo_operator_t toCairoOperator(CompositeOperator op);
-cairo_operator_t toCairoOperator(BlendMode blendOp);
+cairo_operator_t toCairoOperator(CompositeOperator, BlendMode = BlendModeNormal);
 void drawPatternToCairoContext(cairo_t* cr, cairo_surface_t* image, const IntSize& imageSize, const FloatRect& tileRect,
                                const AffineTransform& patternTransform, const FloatPoint& phase, cairo_operator_t op, const FloatRect& destRect);

releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -1037 +1037 @@
         return;
 
-    cairo_operator_t cairo_op;
-    if (blendOp == BlendModeNormal)
-        cairo_op = toCairoOperator(op);
-    else
-        cairo_op = toCairoOperator(blendOp);
-
-    cairo_set_operator(platformContext()->cr(), cairo_op);
+    cairo_set_operator(platformContext()->cr(), toCairoOperator(op, blendOp));
 }
 
@@ -1184 +1178 @@
 
     cairo_t* cr = platformContext()->cr();
-    drawPatternToCairoContext(cr, surface.get(), IntSize(image.size()), tileRect, patternTransform, phase, toCairoOperator(op), destRect);
+    drawPatternToCairoContext(cr, surface.get(), IntSize(image.size()), tileRect, patternTransform, phase, toCairoOperator(op, blendMode), destRect);
 }