Diff
Modified: trunk/LayoutTests/ChangeLog (96150 => 96151)
--- trunk/LayoutTests/ChangeLog 2011-09-27 20:51:24 UTC (rev 96150)
+++ trunk/LayoutTests/ChangeLog 2011-09-27 20:54:16 UTC (rev 96151)
@@ -1,3 +1,17 @@
+2011-09-27 Tim Horton <timothy_hor...@apple.com>
+
+ Rapidly refreshing a feMorphology[erode] with r=0 can sometimes cause display corruption
+ https://bugs.webkit.org/show_bug.cgi?id=68816
+ <rdar://problem/10186468>
+
+ Reviewed by Simon Fraser.
+
+ Add a test which ensures that a zero-radius feMorphology filter returns cleared memory.
+
+ * svg/filters/feMorphology-zero-radius-expected.png: Added.
+ * svg/filters/feMorphology-zero-radius-expected.txt: Added.
+ * svg/filters/feMorphology-zero-radius.svg: Added.
+
2011-09-27 David Hyatt <hy...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=68922
Added: trunk/LayoutTests/svg/filters/feMorphology-zero-radius-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/svg/filters/feMorphology-zero-radius-expected.txt (0 => 96151)
--- trunk/LayoutTests/svg/filters/feMorphology-zero-radius-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/filters/feMorphology-zero-radius-expected.txt 2011-09-27 20:54:16 UTC (rev 96151)
@@ -0,0 +1 @@
+
Added: trunk/LayoutTests/svg/filters/feMorphology-zero-radius.svg (0 => 96151)
--- trunk/LayoutTests/svg/filters/feMorphology-zero-radius.svg (rev 0)
+++ trunk/LayoutTests/svg/filters/feMorphology-zero-radius.svg 2011-09-27 20:54:16 UTC (rev 96151)
@@ -0,0 +1,30 @@
+<svg id="svg" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
+<title>The entire image should be white.</title>
+<defs>
+ <filter id="morph">
+ <feMorphology operator="erode" radius="0"/>
+ </filter>
+</defs>
+<script>
+ <![CDATA[
+ for(var i = 0; i < 100; i+=5)
+ {
+ for(var j = 0; j < 100; j+=5)
+ {
+ var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+ rect.setAttribute("x", i);
+ rect.setAttribute("y", j);
+ rect.setAttribute("width", "5");
+ rect.setAttribute("height", "5");
+ rect.setAttribute("filter", "url(#morph)");
+
+ document.getElementById("svg").appendChild(rect);
+ }
+ }
+
+ if (window.layoutTestController)
+ window.layoutTestController.dumpAsText();
+ ]]>
+</script>
+
+</svg>
Modified: trunk/Source/_javascript_Core/ChangeLog (96150 => 96151)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-27 20:51:24 UTC (rev 96150)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-27 20:54:16 UTC (rev 96151)
@@ -1,3 +1,16 @@
+2011-09-27 Tim Horton <timothy_hor...@apple.com>
+
+ Rapidly refreshing a feMorphology[erode] with r=0 can sometimes cause display corruption
+ https://bugs.webkit.org/show_bug.cgi?id=68816
+ <rdar://problem/10186468>
+
+ Reviewed by Simon Fraser.
+
+ Add ByteArray::clear, which zeros the memory in the ByteArray.
+
+ * wtf/ByteArray.h:
+ (WTF::ByteArray::clear): Added.
+
2011-09-27 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r96131.
Modified: trunk/Source/_javascript_Core/wtf/ByteArray.h (96150 => 96151)
--- trunk/Source/_javascript_Core/wtf/ByteArray.h 2011-09-27 20:51:24 UTC (rev 96150)
+++ trunk/Source/_javascript_Core/wtf/ByteArray.h 2011-09-27 20:54:16 UTC (rev 96151)
@@ -70,6 +70,8 @@
unsigned char* data() { return m_data; }
+ void clear() { memset(m_data, 0, m_size); }
+
void deref()
{
if (derefBase()) {
Modified: trunk/Source/WebCore/ChangeLog (96150 => 96151)
--- trunk/Source/WebCore/ChangeLog 2011-09-27 20:51:24 UTC (rev 96150)
+++ trunk/Source/WebCore/ChangeLog 2011-09-27 20:54:16 UTC (rev 96151)
@@ -1,3 +1,20 @@
+2011-09-27 Tim Horton <timothy_hor...@apple.com>
+
+ Rapidly refreshing a feMorphology[erode] with r=0 can sometimes cause display corruption
+ https://bugs.webkit.org/show_bug.cgi?id=68816
+ <rdar://problem/10186468>
+
+ Reviewed by Simon Fraser.
+
+ If a filter returns without writing into its result buffer, make sure to return an cleared buffer.
+
+ Test: svg/filters/feMorphology-zero-radius.svg
+
+ * platform/graphics/filters/FEMorphology.cpp:
+ (WebCore::FEMorphology::apply):
+ * platform/graphics/filters/FETurbulence.cpp:
+ (WebCore::FETurbulence::apply):
+
2011-09-27 Ryosuke Niwa <rn...@webkit.org>
CompositeEditCommand::prune should remove subtree at once
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp (96150 => 96151)
--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2011-09-27 20:51:24 UTC (rev 96150)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2011-09-27 20:54:16 UTC (rev 96151)
@@ -207,8 +207,10 @@
return;
setIsAlphaImage(in->isAlphaImage());
- if (m_radiusX <= 0 || m_radiusY <= 0)
+ if (m_radiusX <= 0 || m_radiusY <= 0) {
+ dstPixelArray->clear();
return;
+ }
Filter* filter = this->filter();
int radiusX = static_cast<int>(floorf(filter->applyHorizontalScale(m_radiusX)));
Modified: trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp (96150 => 96151)
--- trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2011-09-27 20:51:24 UTC (rev 96150)
+++ trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2011-09-27 20:54:16 UTC (rev 96151)
@@ -372,8 +372,10 @@
if (!pixelArray)
return;
- if (absolutePaintRect().isEmpty())
+ if (absolutePaintRect().isEmpty()) {
+ pixelArray->clear();
return;
+ }
PaintingData paintingData(m_seed, roundedIntSize(filterPrimitiveSubregion().size()));
initPaint(paintingData);
