Changeset 63530 in webkit

Timestamp:

Jul 16, 2010 1:15:39 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-16 Cosmin Truta <​ctruta@chromium.org>

Reviewed by Eric Seidel.

Some SVGs with empty <g> elements crash Chromium on Linux
​https://bugs.webkit.org/show_bug.cgi?id=41175

This is a SVG with an empty <g> within a <g>, to which a filter is applied by reference.
The rendered image is all blank.

• platform/mac/svg/filters/filter-empty-g-expected.checksum: Added
• platform/mac/svg/filters/filter-empty-g-expected.png: Added
• platform/mac/svg/filters/filter-empty-g-expected.txt: Added
• svg/filters/filter-empty-g.svg: Added

2010-07-16 Cosmin Truta <​ctruta@chromium.org>

Reviewed by Eric Seidel.

Some SVGs with empty <g> elements crash Chromium on Linux
​https://bugs.webkit.org/show_bug.cgi?id=41175

Avoid painting of zero-sized image buffers. Skia can't handle it.

Test: svg/filters/filter-empty-g.svg

• WebCore/platform/graphics/skia/ImageBufferSkia.cpp: (ImageBuffer::ImageBuffer):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/filter-empty-g-expected.checksum (added)
• LayoutTests/platform/mac/svg/filters/filter-empty-g-expected.png (added)
• LayoutTests/platform/mac/svg/filters/filter-empty-g-expected.txt (added)
• LayoutTests/svg/filters/filter-empty-g.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-16  Cosmin Truta  <ctruta@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Some SVGs with empty <g> elements crash Chromium on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=41175
+
+        This is a SVG with an empty <g> within a <g>, to which a filter is applied by reference.
+        The rendered image is all blank.
+
+        * platform/mac/svg/filters/filter-empty-g-expected.checksum: Added
+        * platform/mac/svg/filters/filter-empty-g-expected.png: Added
+        * platform/mac/svg/filters/filter-empty-g-expected.txt: Added
+        * svg/filters/filter-empty-g.svg: Added
+
 2010-07-16  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2695 +2695 @@
 BUG33812 SKIP : fast/dom/icon-url-property.html = FAIL
 
+// As long as the Chromium issue 37986 is unresolved, this may crash.
+BUG41808 LINUX : svg/filters/filter-empty-g.svg = CRASH PASS
+
 // Failing with webkit roll 57659 -> 57677.
 BUG41817 WIN LINUX : fast/backgrounds/svg-as-background-1.html = IMAGE PASS

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-16  Cosmin Truta  <ctruta@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Some SVGs with empty <g> elements crash Chromium on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=41175
+
+        Avoid painting of zero-sized image buffers. Skia can't handle it.
+
+        Test: svg/filters/filter-empty-g.svg
+
+        * WebCore/platform/graphics/skia/ImageBufferSkia.cpp:
+        (ImageBuffer::ImageBuffer):
+
 2010-07-16  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -75 +75 @@
     // required, but the canvas is currently filled with the magic transparency
     // color. Can we have another way to manage this?
-    m_data.m_canvas.drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
+    //
+    // Avoid drawing on a zero-sized canvas. Skia can't handle it.
+    if (!size.isZero())
+        m_data.m_canvas.drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
     success = true;
 }