Changeset 246354 in webkit

Timestamp:

Jun 12, 2019 9:21:20 AM (5 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r246350.

r246350 Introduced a failing and timing out test svg/clip-path
/clip-hidpi.svg

Reverted changeset:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/clip-path/clip-hidpi-expected.svg (deleted)
• LayoutTests/svg/clip-path/clip-hidpi.svg (deleted)
• LayoutTests/svg/clip-path/clip-opacity-translate-expected.svg (deleted)
• LayoutTests/svg/clip-path/clip-opacity-translate.svg (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-12  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r246350.
+
+        r246350 Introduced a failing and timing out test svg/clip-path
+        /clip-hidpi.svg
+
+        Reverted changeset:
+
+        "[cairo][SVG] Putting multiple path elements in clippath
+        causes rendering artifacts"
+        https://bugs.webkit.org/show_bug.cgi?id=198701
+        https://trac.webkit.org/changeset/246350
+
 2019-06-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-12  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r246350.
+
+        r246350 Introduced a failing and timing out test svg/clip-path
+        /clip-hidpi.svg
+
+        Reverted changeset:
+
+        "[cairo][SVG] Putting multiple path elements in clippath
+        causes rendering artifacts"
+        https://bugs.webkit.org/show_bug.cgi?id=198701
+        https://trac.webkit.org/changeset/246350
+
 2019-06-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -31 +31 @@
 #if USE(CAIRO)
 
+#include "CairoUtilities.h"
+#include "Gradient.h"
+#include "GraphicsContext.h"
+#include "Pattern.h"
 #include <cairo.h>
 
 namespace WebCore {
+
+// In Cairo image masking is immediate, so to emulate image clipping we must save masking
+// details as part of the context state and apply them during platform restore.
+class ImageMaskInformation {
+public:
+    void update(cairo_surface_t* maskSurface, const FloatRect& maskRect)
+    {
+        m_maskSurface = maskSurface;
+        m_maskRect = maskRect;
+    }
+
+    bool isValid() const { return m_maskSurface; }
+    cairo_surface_t* maskSurface() const { return m_maskSurface.get(); }
+    const FloatRect& maskRect() const { return m_maskRect; }
+
+private:
+    RefPtr<cairo_surface_t> m_maskSurface;
+    FloatRect m_maskRect;
+};
+
 
 // Encapsulates the additional painting state information we store for each
@@ -41 +65 @@
     State() = default;
 
-    struct {
-        RefPtr<cairo_pattern_t> pattern;
-        cairo_matrix_t matrix;
-    } m_mask;
+    ImageMaskInformation m_imageMaskInformation;
 };
 
@@ -56 +77 @@
 void PlatformContextCairo::restore()
 {
-    if (m_state->m_mask.pattern) {
+    const ImageMaskInformation& maskInformation = m_state->m_imageMaskInformation;
+    if (maskInformation.isValid()) {
+        const FloatRect& maskRect = maskInformation.maskRect();
         cairo_pop_group_to_source(m_cr.get());
-
-        cairo_matrix_t matrix;
-        cairo_get_matrix(m_cr.get(), &matrix);
-        cairo_set_matrix(m_cr.get(), &m_state->m_mask.matrix);
-        cairo_mask(m_cr.get(), m_state->m_mask.pattern.get());
-        cairo_set_matrix(m_cr.get(), &matrix);
+        cairo_mask_surface(m_cr.get(), maskInformation.maskSurface(), maskRect.x(), maskRect.y());
     }
 
@@ -88 +106 @@
     // since we actually apply the mask in restorePlatformState.
     ASSERT(!m_stateStack.isEmpty());
-    m_state->m_mask.pattern = adoptRef(cairo_pattern_create_for_surface(surface));
-    cairo_get_matrix(m_cr.get(), &m_state->m_mask.matrix);
+    m_state->m_imageMaskInformation.update(surface, rect);
 
-    cairo_matrix_t matrix;
-    cairo_matrix_init_translate(&matrix, -rect.x(), -rect.y());
-    cairo_pattern_set_matrix(m_state->m_mask.pattern.get(), &matrix);
-
+    // Cairo doesn't support the notion of an image clip, so we push a group here
+    // and then paint it to the surface with an image mask (which is an immediate
+    // operation) during restorePlatformState.
     cairo_push_group(m_cr.get());
 }