Changeset 246309 in webkit

Timestamp:

Jun 11, 2019 5:50:50 AM (5 years ago)

Author:

Fujii Hironori

Message:

[cairo][SVG] Putting multiple path elements in clippath causes rendering artifacts
​https://bugs.webkit.org/show_bug.cgi?id=198701

Source/WebCore:

PlatformContextCairo::pushImageMask blits wrong position of the
surface to the background of masking objects. And, I don't know
the reason why this blitting is needed. Removed the blitting.

Reviewed by Carlos Garcia Campos.

Tests: svg/clip-path/clip-opacity.html

svg/clip-path/svg-in-html.html

• platform/graphics/cairo/PlatformContextCairo.cpp:

(WebCore::PlatformContextCairo::pushImageMask): Don't blit the
surface to the background.

LayoutTests:

Reviewed by Carlos Garcia Campos.

• platform/gtk/TestExpectations:
• platform/wpe/TestExpectations:

Unskipped svg/gradients/spreadMethodDiagonal3.svg and svg/gradients/spreadMethodDiagonal4.svg.

• svg/clip-path/clip-opacity-expected.html: Added.
• svg/clip-path/clip-opacity.html: Added.
• svg/clip-path/svg-in-html-expected.html: Added.
• svg/clip-path/svg-in-html.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/wpe/TestExpectations (modified) (1 diff)
• LayoutTests/svg/clip-path/clip-opacity-expected.html (added)
• LayoutTests/svg/clip-path/clip-opacity.html (added)
• LayoutTests/svg/clip-path/svg-in-html-expected.html (added)
• LayoutTests/svg/clip-path/svg-in-html.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [cairo][SVG] Putting multiple path elements in clippath causes rendering artifacts
+        https://bugs.webkit.org/show_bug.cgi?id=198701
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/gtk/TestExpectations:
+        * platform/wpe/TestExpectations:
+        Unskipped svg/gradients/spreadMethodDiagonal3.svg and svg/gradients/spreadMethodDiagonal4.svg.
+
+        * svg/clip-path/clip-opacity-expected.html: Added.
+        * svg/clip-path/clip-opacity.html: Added.
+        * svg/clip-path/svg-in-html-expected.html: Added.
+        * svg/clip-path/svg-in-html.html: Added.
+
 2019-06-10  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -3623 +3623 @@
 
 webkit.org/b/189739 svg/gradients/spreadMethodClose2.svg [ ImageOnlyFailure ]
-webkit.org/b/189739 svg/gradients/spreadMethodDiagonal3.svg [ ImageOnlyFailure ]
-webkit.org/b/189739 svg/gradients/spreadMethodDiagonal4.svg [ ImageOnlyFailure ]
 
 webkit.org/b/189994 fast/files/xhr-response-blob.html [ Failure ]

trunk/LayoutTests/platform/wpe/TestExpectations

@@ -1307 +1307 @@
 webkit.org/b/112228 svg/custom/resources-css-scaled.html [ ImageOnlyFailure ]
 webkit.org/b/189739 svg/gradients/spreadMethodClose2.svg [ ImageOnlyFailure ]
-webkit.org/b/189739 svg/gradients/spreadMethodDiagonal3.svg [ ImageOnlyFailure ]
-webkit.org/b/189739 svg/gradients/spreadMethodDiagonal4.svg [ ImageOnlyFailure ]
 webkit.org/b/115440 svg/stroke/animated-non-scaling-stroke.html [ ImageOnlyFailure Pass ]
 webkit.org/b/88230 svg/stroke/non-scaling-stroke-pattern.svg [ ImageOnlyFailure Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [cairo][SVG] Putting multiple path elements in clippath causes rendering artifacts
+        https://bugs.webkit.org/show_bug.cgi?id=198701
+
+        PlatformContextCairo::pushImageMask blits wrong position of the
+        surface to the background of masking objects. And, I don't know
+        the reason why this blitting is needed. Removed the blitting.
+
+        Reviewed by Carlos Garcia Campos.
+
+        Tests: svg/clip-path/clip-opacity.html
+               svg/clip-path/svg-in-html.html
+
+        * platform/graphics/cairo/PlatformContextCairo.cpp:
+        (WebCore::PlatformContextCairo::pushImageMask): Don't blit the
+        surface to the background.
+
 2019-06-10  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -111 +111 @@
     // and then paint it to the surface with an image mask (which is an immediate
     // operation) during restorePlatformState.
-
-    // We want to allow the clipped elements to composite with the surface as it
-    // is now, but they are isolated in another group. To make this work, we're
-    // going to blit the current surface contents onto the new group once we push it.
-    cairo_surface_t* currentTarget = cairo_get_target(m_cr.get());
-    cairo_surface_flush(currentTarget);
-
-    // Pushing a new group ensures that only things painted after this point are clipped.
     cairo_push_group(m_cr.get());
-    cairo_set_operator(m_cr.get(), CAIRO_OPERATOR_SOURCE);
-
-    // To avoid the limit of Pixman backend, we need to reduce the size of pattern matrix
-    // See https://bugs.webkit.org/show_bug.cgi?id=154283
-    cairo_set_source_surface(m_cr.get(), currentTarget, rect.x(), rect.y());
-    cairo_translate(m_cr.get(), rect.x(), rect.y());
-    cairo_rectangle(m_cr.get(), 0, 0, rect.width(), rect.height());
-    cairo_fill(m_cr.get());
-    cairo_translate(m_cr.get(), -rect.x(), -rect.y());
 }