Changeset 120755 in webkit

Timestamp:

Jun 19, 2012 2:33:56 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[cairo] Fix LayoutTests/fast/canvas/patternfill-repeat.html
​https://bugs.webkit.org/show_bug.cgi?id=53085

Patch by Dominik Röttsches <​dominik.rottsches@intel.com> on 2012-06-19
Reviewed by Martin Robinson.

Source/WebCore:

Clipping previously unlimited vertical and horizontal pattern repeats with
a clip rectangle similar to the Qt Graphics Context.

No new tests, this patch fixes
canvas/philip/tests/2d.pattern.paint.repeat* tests.

• platform/graphics/Pattern.h:

(WebCore::Pattern::getPatternSpaceTransform): Adding constant getter method to be able to map to pattern space externally, needed by PlatformContextCairo::clipForPatternFilling.

• platform/graphics/cairo/PlatformContextCairo.cpp:

(WebCore::PlatformContextCairo::prepareForFilling):
(WebCore::PlatformContextCairo::clipForPatternFilling): Clip pattern repeats if needed.

• platform/graphics/cairo/PlatformContextCairo.h:

LayoutTests:

canvas/philip/tests/2d.pattern.paint.repeat* tests now passing.

• platform/efl/Skipped:
• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/Pattern.h (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/PlatformContextCairo.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/cairo/PlatformContextCairo.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-19  Dominik Röttsches  <dominik.rottsches@intel.com>
+
+        [cairo] Fix LayoutTests/fast/canvas/patternfill-repeat.html
+        https://bugs.webkit.org/show_bug.cgi?id=53085
+
+        Reviewed by Martin Robinson.
+
+        canvas/philip/tests/2d.pattern.paint.repeat* tests now passing.
+
+        * platform/efl/Skipped:
+        * platform/gtk/TestExpectations:
+
 2012-06-19  Hayato Ito  <hayato@chromium.org>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -386 +386 @@
 # rectangle has zero height.
 canvas/philip/tests/2d.path.rect.zero.6.html
-
-# Repeat-x/-y doesn't work - not supported in Cairo, workaround needed
-# https://bugs.webkit.org/show_bug.cgi?id=53085
-canvas/philip/tests/2d.pattern.paint.repeatx.coord1.html
-canvas/philip/tests/2d.pattern.paint.repeatx.outside.html
-canvas/philip/tests/2d.pattern.paint.repeaty.coord1.html
-canvas/philip/tests/2d.pattern.paint.repeaty.outside.html
 
 # BUG: Bug in the test itself, as the input box can be big enough for the given coordinates to be inside it.

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -818 +818 @@
 BUGWKGTK : canvas/philip/tests/2d.path.rect.zero.6.html = TEXT
 
-// Repeat-x/-y doesn't work - not supported in Cairo, workaround needed
-BUGWK53085 : canvas/philip/tests/2d.pattern.paint.repeatx.coord1.html = TEXT
-BUGWK53085 : canvas/philip/tests/2d.pattern.paint.repeatx.outside.html = TEXT
-BUGWK53085 : canvas/philip/tests/2d.pattern.paint.repeaty.coord1.html = TEXT
-BUGWK53085 : canvas/philip/tests/2d.pattern.paint.repeaty.outside.html = TEXT
-
 // Tests that user modal dialogs fail in the DRT for some reason.
 BUGWK53600 : fast/animation/request-animation-frame-during-modal.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-19  Dominik Röttsches  <dominik.rottsches@intel.com>
+
+        [cairo] Fix LayoutTests/fast/canvas/patternfill-repeat.html
+        https://bugs.webkit.org/show_bug.cgi?id=53085
+
+        Reviewed by Martin Robinson.
+
+        Clipping previously unlimited vertical and horizontal pattern repeats with
+        a clip rectangle similar to the Qt Graphics Context.
+
+        No new tests, this patch fixes
+        canvas/philip/tests/2d.pattern.paint.repeat* tests.
+
+        * platform/graphics/Pattern.h:
+        (WebCore::Pattern::getPatternSpaceTransform): Adding constant getter method to be able to map to pattern space externally, needed by PlatformContextCairo::clipForPatternFilling.
+        * platform/graphics/cairo/PlatformContextCairo.cpp:
+        (WebCore::PlatformContextCairo::prepareForFilling):
+        (WebCore::PlatformContextCairo::clipForPatternFilling): Clip pattern repeats if needed.
+        * platform/graphics/cairo/PlatformContextCairo.h:
+
 2012-06-19  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/platform/graphics/Pattern.h

@@ -83 +83 @@
 #endif
     void setPatternSpaceTransform(const AffineTransform& patternSpaceTransformation);
+    const AffineTransform& getPatternSpaceTransform() { return m_patternSpaceTransformation; };
     void setPlatformPatternSpaceTransform();
 

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

@@ -32 +32 @@
 #include "Gradient.h"
 #include "GraphicsContext.h"
+#include "OwnPtrCairo.h"
 #include "Pattern.h"
 #include <cairo.h>
@@ -252 +253 @@
                               state.fillColor,
                               patternAdjustment == AdjustPatternForGlobalAlpha ? globalAlpha() : 1);
+
+    if (state.fillPattern)
+        clipForPatternFilling(state);
 }
 
@@ -263 +267 @@
 }
 
+void PlatformContextCairo::clipForPatternFilling(const GraphicsContextState& state)
+{
+    ASSERT(state.fillPattern);
+
+    // Hold current cairo path in a variable for restoring it after configuring the pattern clip rectangle.
+    OwnPtr<cairo_path_t> currentPath = adoptPtr(cairo_copy_path(m_cr.get()));
+    cairo_new_path(m_cr.get());
+
+    // Initialize clipping extent from current cairo clip extents, then shrink if needed according to pattern.
+    // Inspired by GraphicsContextQt::drawRepeatPattern.
+    double x1, y1, x2, y2;
+    cairo_clip_extents(m_cr.get(), &x1, &y1, &x2, &y2);
+    FloatRect clipRect(x1, y1, x2 - x1, y2 - y1);
+
+    Image* patternImage = state.fillPattern->tileImage();
+    ASSERT(patternImage);
+    const AffineTransform& patternTransform = state.fillPattern->getPatternSpaceTransform();
+    FloatRect patternRect = patternTransform.mapRect(FloatRect(0, 0, patternImage->width(), patternImage->height()));
+
+    bool repeatX = state.fillPattern->repeatX();
+    bool repeatY = state.fillPattern->repeatY();
+
+    if (!repeatX) {
+        clipRect.setX(patternRect.x());
+        clipRect.setWidth(patternRect.width());
+    }
+    if (!repeatY) {
+        clipRect.setY(patternRect.y());
+        clipRect.setHeight(patternRect.height());
+    }
+    if (!repeatX || !repeatY) {
+        cairo_rectangle(m_cr.get(), clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height());
+        cairo_clip(m_cr.get());
+    }
+
+    // Restoring cairo path.
+    cairo_append_path(m_cr.get(), currentPath.get());
+}
+
 } // namespace WebCore

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

@@ -69 +69 @@
 
 private:
+    void clipForPatternFilling(const GraphicsContextState&);
+
     RefPtr<cairo_t> m_cr;