Changeset 255477 in webkit

Timestamp:

Jan 30, 2020, 5:53:52 PM (7 years ago)

Author:

Fujii Hironori

Message:

[Cairo] Use CAIRO_FILTER_BILINEAR for image tile painting with InterpolationQuality::Default
​https://bugs.webkit.org/show_bug.cgi?id=201326

Reviewed by Carlos Garcia Campos.

Mac port is using a better image interpolation method for painting
a single image than painting tiled images.

In Cairo port, CAIRO_FILTER_GOOD was used for both cases as
default. CAIRO_FILTER_GOOD is using separable convolution filter
for down-scaling (≤ 0.75 and ≠ 0.5), and bi-linear filter
otherwise. The separable convolution filter is better quality but
quite slower than bi-linear filter.

drawSurface of CairoOperations.cpp has the code to choose a filter
based on InterpolationQuality.
<​https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp?rev=254506#L966>

This change copied the code to drawPatternToCairoContext, and
changed it to use CAIRO_FILTER_BILINEAR for
InterpolationQuality::Default.

• platform/graphics/cairo/CairoOperations.cpp:

(WebCore::Cairo::drawPattern):

• platform/graphics/cairo/CairoUtilities.cpp:

(WebCore::drawPatternToCairoContext): Set a filter by calling
cairo_pattern_set_filter based on InterpolationQuality.

• platform/graphics/cairo/CairoUtilities.h: Added a InterpolationQuality argument.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-30  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Cairo] Use CAIRO_FILTER_BILINEAR for image tile painting with InterpolationQuality::Default
+        https://bugs.webkit.org/show_bug.cgi?id=201326
+
+        Reviewed by Carlos Garcia Campos.
+
+        Mac port is using a better image interpolation method for painting
+        a single image than painting tiled images.
+
+        In Cairo port, CAIRO_FILTER_GOOD was used for both cases as
+        default. CAIRO_FILTER_GOOD is using separable convolution filter
+        for down-scaling (≤ 0.75 and ≠ 0.5), and bi-linear filter
+        otherwise. The separable convolution filter is better quality but
+        quite slower than bi-linear filter.
+
+        drawSurface of CairoOperations.cpp has the code to choose a filter
+        based on InterpolationQuality.
+        <https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp?rev=254506#L966>
+
+        This change copied the code to drawPatternToCairoContext, and
+        changed it to use CAIRO_FILTER_BILINEAR for
+        InterpolationQuality::Default.
+
+        * platform/graphics/cairo/CairoOperations.cpp:
+        (WebCore::Cairo::drawPattern):
+        * platform/graphics/cairo/CairoUtilities.cpp:
+        (WebCore::drawPatternToCairoContext): Set a filter by calling
+        cairo_pattern_set_filter based on InterpolationQuality.
+        * platform/graphics/cairo/CairoUtilities.h: Added a InterpolationQuality argument.
+
 2020-01-30  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp

@@ -917 +917 @@
 {
     // FIXME: Investigate why the size has to be passed in as an IntRect.
-    drawPatternToCairoContext(platformContext.cr(), surface, size, tileRect, patternTransform, phase, toCairoOperator(options.compositeOperator(), options.blendMode()), destRect);
+    drawPatternToCairoContext(platformContext.cr(), surface, size, tileRect, patternTransform, phase, toCairoOperator(options.compositeOperator(), options.blendMode()), options.interpolationQuality(), destRect);
 }
 

trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp

@@ -203 +203 @@
 
 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)
+    const AffineTransform& patternTransform, const FloatPoint& phase, cairo_operator_t op, InterpolationQuality imageInterpolationQuality, const FloatRect& destRect)
 {
     // Avoid NaN
@@ -222 +222 @@
 
     cairo_pattern_t* pattern = cairo_pattern_create_for_surface(image);
+    switch (imageInterpolationQuality) {
+    case InterpolationQuality::DoNotInterpolate:
+    case InterpolationQuality::Low:
+        cairo_pattern_set_filter(pattern, CAIRO_FILTER_FAST);
+        break;
+    case InterpolationQuality::Default:
+        cairo_pattern_set_filter(pattern, CAIRO_FILTER_BILINEAR);
+        break;
+    case InterpolationQuality::Medium:
+        cairo_pattern_set_filter(pattern, CAIRO_FILTER_GOOD);
+        break;
+    case InterpolationQuality::High:
+        cairo_pattern_set_filter(pattern, CAIRO_FILTER_BEST);
+        break;
+    }
     cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
 

trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h

@@ -85 +85 @@
 cairo_operator_t toCairoOperator(CompositeOperator, BlendMode = BlendMode::Normal);
 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);
+    const AffineTransform& patternTransform, const FloatPoint& phase, cairo_operator_t, InterpolationQuality, const FloatRect& destRect);
 RefPtr<cairo_surface_t> copyCairoImageSurface(cairo_surface_t*);