[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 15:01:46 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 8fa4cc227c53f1e068fb8d377feb0403728ce640
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 16:02:34 2010 +0000

    2010-10-27  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dirk Schulze.
    
            Ignore invalid blend modes
            https://bugs.webkit.org/show_bug.cgi?id=48371
    
            Test: svg/filters/feBlend-invalid-mode.xhtml
    
            * platform/graphics/filters/FEBlend.cpp:
            (WebCore::FEBlend::apply):
    2010-10-27  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dirk Schulze.
    
            Ignore invalid blend modes
            https://bugs.webkit.org/show_bug.cgi?id=48371
    
            * svg/filters/feBlend-invalid-mode-expected.txt: Added.
            * svg/filters/feBlend-invalid-mode.xhtml: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a3a92f4..6f2bcba 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-27  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dirk Schulze.
+
+        Ignore invalid blend modes
+        https://bugs.webkit.org/show_bug.cgi?id=48371
+
+        * svg/filters/feBlend-invalid-mode-expected.txt: Added.
+        * svg/filters/feBlend-invalid-mode.xhtml: Added.
+
 2010-10-27  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/LayoutTests/svg/filters/feBlend-invalid-mode-expected.txt b/LayoutTests/svg/filters/feBlend-invalid-mode-expected.txt
new file mode 100644
index 0000000..e3eec24
--- /dev/null
+++ b/LayoutTests/svg/filters/feBlend-invalid-mode-expected.txt
@@ -0,0 +1 @@
+PASS: Invalid blend modes do not trigger a crash. 
diff --git a/LayoutTests/svg/filters/feBlend-invalid-mode.xhtml b/LayoutTests/svg/filters/feBlend-invalid-mode.xhtml
new file mode 100644
index 0000000..880ac30
--- /dev/null
+++ b/LayoutTests/svg/filters/feBlend-invalid-mode.xhtml
@@ -0,0 +1,18 @@
+<html>
+<body>
+<p>PASS: Invalid blend modes do not trigger a crash.</p>
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+    <filter id="filter">
+        <feBlend id="blend" />
+    </filter>
+</defs>
+<rect filter="url(#filter)" width="10" height="10"/>   
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+document.getElementById('blend').mode.baseVal=-1;
+</script>
+</svg>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eaf0261..f6dc0ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-27  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dirk Schulze.
+
+        Ignore invalid blend modes
+        https://bugs.webkit.org/show_bug.cgi?id=48371
+
+        Test: svg/filters/feBlend-invalid-mode.xhtml
+
+        * platform/graphics/filters/FEBlend.cpp:
+        (WebCore::FEBlend::apply):
+
 2010-10-27  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/platform/graphics/filters/FEBlend.cpp b/WebCore/platform/graphics/filters/FEBlend.cpp
index 0e82e2e..03b95c3 100644
--- a/WebCore/platform/graphics/filters/FEBlend.cpp
+++ b/WebCore/platform/graphics/filters/FEBlend.cpp
@@ -95,7 +95,7 @@ void FEBlend::apply(Filter* filter)
     if (!in->resultImage() || !in2->resultImage())
         return;
 
-    if (m_mode == FEBLEND_MODE_UNKNOWN)
+    if (m_mode <= FEBLEND_MODE_UNKNOWN || m_mode > FEBLEND_MODE_LIGHTEN)
         return;
 
     if (!effectContext(filter))

-- 
WebKit Debian packaging

