2011-03-31 Sheriff Bot <webkit.review.bot@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Mar 2011 13:24:54 +0000 (13:24 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Mar 2011 13:24:54 +0000 (13:24 +0000)
        Unreviewed, rolling out r82565.
        http://trac.webkit.org/changeset/82565
        https://bugs.webkit.org/show_bug.cgi?id=57541

        Caused assertion failures. (Requested by bbandix on #webkit).

        * platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.checksum: Removed.
        * platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png: Removed.
        * platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.checksum: Removed.
        * platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.png: Removed.
        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.checksum: Removed.
        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.png: Removed.
        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.checksum: Removed.
        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.png: Removed.
        * svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.txt: Removed.
        * svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.html: Removed.
        * svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.txt: Removed.
        * svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color.html: Removed.
        * svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.txt: Removed.
        * svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.html: Removed.
        * svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.txt: Removed.
        * svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop.html: Removed.
        * svg/dynamic-updates/script-tests/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js: Removed.
        * svg/dynamic-updates/script-tests/SVGFEFloodElement-inherit-flood-color-css-prop.js: Removed.
        * svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.js: Removed.
        * svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-lighting-color-css-prop.js: Removed.
2011-03-31  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r82565.
        http://trac.webkit.org/changeset/82565
        https://bugs.webkit.org/show_bug.cgi?id=57541

        Caused assertion failures. (Requested by bbandix on #webkit).

        * platform/graphics/filters/FEFlood.cpp:
        (WebCore::FEFlood::setFloodColor):
        (WebCore::FEFlood::setFloodOpacity):
        * platform/graphics/filters/FEFlood.h:
        * platform/graphics/filters/FESpecularLighting.cpp:
        (WebCore::FESpecularLighting::setLightingColor):
        * platform/graphics/filters/FESpecularLighting.h:
        * rendering/svg/RenderSVGResourceFilterPrimitive.cpp:
        * rendering/svg/RenderSVGResourceFilterPrimitive.h:
        * rendering/svg/SVGResourcesCache.cpp:
        (WebCore::SVGResourcesCache::clientStyleChanged):
        * svg/SVGFEDiffuseLightingElement.cpp:
        (WebCore::SVGFEDiffuseLightingElement::setFilterEffectAttribute):
        * svg/SVGFEFloodElement.cpp:
        * svg/SVGFEFloodElement.h:
        * svg/SVGFESpecularLightingElement.cpp:
        (WebCore::SVGFESpecularLightingElement::setFilterEffectAttribute):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@82571 268f45cc-cd09-0410-ab3c-d52691b4dbfc

33 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.checksum [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.checksum [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.png [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.checksum [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.png [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.checksum [deleted file]
LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.png [deleted file]
LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.txt [deleted file]
LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.html [deleted file]
LayoutTests/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.txt [deleted file]
LayoutTests/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color.html [deleted file]
LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.txt [deleted file]
LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.html [deleted file]
LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.txt [deleted file]
LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop.html [deleted file]
LayoutTests/svg/dynamic-updates/script-tests/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js [deleted file]
LayoutTests/svg/dynamic-updates/script-tests/SVGFEFloodElement-inherit-flood-color-css-prop.js [deleted file]
LayoutTests/svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.js [deleted file]
LayoutTests/svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-lighting-color-css-prop.js [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/filters/FEFlood.cpp
Source/WebCore/platform/graphics/filters/FEFlood.h
Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp
Source/WebCore/platform/graphics/filters/FESpecularLighting.h
Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.cpp
Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.h
Source/WebCore/rendering/svg/SVGResourcesCache.cpp
Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp
Source/WebCore/svg/SVGFEFloodElement.cpp
Source/WebCore/svg/SVGFEFloodElement.h
Source/WebCore/svg/SVGFESpecularLightingElement.cpp

index f85456d..6b11bc0 100644 (file)
@@ -1,3 +1,32 @@
+2011-03-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r82565.
+        http://trac.webkit.org/changeset/82565
+        https://bugs.webkit.org/show_bug.cgi?id=57541
+
+        Caused assertion failures. (Requested by bbandix on #webkit).
+
+        * platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.checksum: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.checksum: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.png: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.checksum: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.png: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.checksum: Removed.
+        * platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.png: Removed.
+        * svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.txt: Removed.
+        * svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.html: Removed.
+        * svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.txt: Removed.
+        * svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color.html: Removed.
+        * svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.txt: Removed.
+        * svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.html: Removed.
+        * svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.txt: Removed.
+        * svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop.html: Removed.
+        * svg/dynamic-updates/script-tests/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js: Removed.
+        * svg/dynamic-updates/script-tests/SVGFEFloodElement-inherit-flood-color-css-prop.js: Removed.
+        * svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.js: Removed.
+        * svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-lighting-color-css-prop.js: Removed.
+
 2011-03-31  Pavel Podivilov  <podivilov@chromium.org>
 
         Unreviewed, fix error in chromium test expectations.
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.checksum
deleted file mode 100644 (file)
index cbe56e4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-a7921a4474a66d18968bdda5cdb8f8ac
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png
deleted file mode 100644 (file)
index 74c6885..0000000
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.checksum
deleted file mode 100644 (file)
index a7b59a4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-6e83f3ce6218c0436c8b7c7aad7059f8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.png
deleted file mode 100644 (file)
index 598762a..0000000
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.checksum
deleted file mode 100644 (file)
index 1edc418..0000000
+++ /dev/null
@@ -1 +0,0 @@
-8233e8dc288e42bc15e9978485778530
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.png
deleted file mode 100644 (file)
index 9220ec3..0000000
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.checksum
deleted file mode 100644 (file)
index 1805a43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-45022fd0b20a79da03e0642fb88e910f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.png
deleted file mode 100644 (file)
index c53f4a2..0000000
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.png and /dev/null differ
diff --git a/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.txt b/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.txt
deleted file mode 100644 (file)
index 5ac6d78..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-SVG 1.1 dynamic update tests
-
-Tests dynamic updates of the inherited 'lighting-color' css property of the SVGFEDiffuseLightingElement object
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.defaultView.getComputedStyle(feDiffuseLightingElement).getPropertyValue('lighting-color') is "rgb(255, 0, 0)"
-PASS document.defaultView.getComputedStyle(feDiffuseLightingElement).getPropertyValue('lighting-color') is "rgb(255, 255, 0)"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.html b/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.html
deleted file mode 100644 (file)
index c3b5b6e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
-<script src="resources/SVGTestCase.js"></script>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<h1>SVG 1.1 dynamic update tests</h1>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.txt b/LayoutTests/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color-expected.txt
deleted file mode 100644 (file)
index d472051..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-SVG 1.1 dynamic update tests
-
-Tests dynamic updates of the inherited 'flood-color' attribute of the SVGFEFloodElement object
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.defaultView.getComputedStyle(floodElement).getPropertyValue('flood-color') is "rgb(145, 32, 103)"
-PASS document.defaultView.getComputedStyle(floodElement).getPropertyValue('flood-color') is "rgb(64, 128, 103)"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color.html b/LayoutTests/svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color.html
deleted file mode 100644 (file)
index 63441ff..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
-<script src="resources/SVGTestCase.js"></script>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<h1>SVG 1.1 dynamic update tests</h1>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/SVGFEFloodElement-inherit-flood-color-css-prop.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.txt b/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop-expected.txt
deleted file mode 100644 (file)
index 6cf6e30..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-SVG 1.1 dynamic update tests
-
-Tests dynamic updates of the inherited 'lighting-color' attribute of the SVGFESpecularLightingElement object
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color') is "rgb(255, 0, 0)"
-PASS document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color') is "rgb(173, 255, 47)"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.html b/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.html
deleted file mode 100644 (file)
index 43cf56f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
-<script src="resources/SVGTestCase.js"></script>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<h1>SVG 1.1 dynamic update tests</h1>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.txt b/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop-expected.txt
deleted file mode 100644 (file)
index 4611494..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-SVG 1.1 dynamic update tests
-
-Tests dynamic updates of the 'lighting-color' attribute of the SVGFESpecularLightingElement object
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color') is "rgb(255, 255, 0)"
-PASS document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color') is "rgb(173, 255, 47)"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop.html b/LayoutTests/svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop.html
deleted file mode 100644 (file)
index 9e2e8ad..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
-<script src="resources/SVGTestCase.js"></script>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<h1>SVG 1.1 dynamic update tests</h1>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/SVGFESpecularLightingElement-lighting-color-css-prop.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/svg/dynamic-updates/script-tests/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js b/LayoutTests/svg/dynamic-updates/script-tests/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js
deleted file mode 100644 (file)
index 6ece156..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-// [Name] SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.js
-// [Expected rendering result] A shining circle (performed by diffuse lighting) - and a series of PASS messages
-
-description("Tests dynamic updates of the inherited 'lighting-color' css property of the SVGFEDiffuseLightingElement object");
-createSVGTestCase();
-
-var pointLight = createSVGElement("fePointLight");
-pointLight.setAttribute("x", "100");
-pointLight.setAttribute("y", "180");
-pointLight.setAttribute("z", "30");
-
-var blurElement = createSVGElement("feGaussianBlur");
-blurElement.setAttribute("in", "SourceGraphic");
-blurElement.setAttribute("stdDeviation", "2");
-blurElement.setAttribute("result", "blur");
-
-var feDiffuseLightingElement = createSVGElement("feDiffuseLighting");
-feDiffuseLightingElement.setAttribute("in", "blur");
-feDiffuseLightingElement.setAttribute("surfaceScale", "1");
-feDiffuseLightingElement.setAttribute("diffuseConstant", "1");
-feDiffuseLightingElement.setAttribute("lighting-color", "inherit");
-feDiffuseLightingElement.appendChild(pointLight);
-
-var filterElement = createSVGElement("filter");
-filterElement.setAttribute("id", "myFilter");
-filterElement.setAttribute("filterUnits", "userSpaceOnUse");
-filterElement.setAttribute("x", "0");
-filterElement.setAttribute("y", "0");
-filterElement.setAttribute("width", "200");
-filterElement.setAttribute("height", "200");
-filterElement.setAttribute("style", "lighting-color:red");
-filterElement.appendChild(blurElement);
-filterElement.appendChild(feDiffuseLightingElement);
-
-var defsElement = createSVGElement("defs");
-defsElement.appendChild(filterElement);
-
-rootSVGElement.appendChild(defsElement);
-
-var rectElement = createSVGElement("circle");
-rectElement.setAttribute("width", 200);
-rectElement.setAttribute("height", 200);
-rectElement.setAttribute("cx", "100");
-rectElement.setAttribute("cy", "60");
-rectElement.setAttribute("r", "50");
-rectElement.setAttribute("filter", "url(#myFilter)");
-rootSVGElement.appendChild(rectElement);
-
-shouldBeEqualToString("document.defaultView.getComputedStyle(feDiffuseLightingElement).getPropertyValue('lighting-color')", "rgb(255, 0, 0)");
-
-function executeTest() {
-    feDiffuseLightingElement.style.setProperty("lighting-color", "yellow", "");
-    shouldBeEqualToString("document.defaultView.getComputedStyle(feDiffuseLightingElement).getPropertyValue('lighting-color')", "rgb(255, 255, 0)");
-
-    completeTest();
-}
-
-startTest(rectElement, 100, 100);
-
-var successfullyParsed = true;
diff --git a/LayoutTests/svg/dynamic-updates/script-tests/SVGFEFloodElement-inherit-flood-color-css-prop.js b/LayoutTests/svg/dynamic-updates/script-tests/SVGFEFloodElement-inherit-flood-color-css-prop.js
deleted file mode 100644 (file)
index 8f12b9d..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-// [Name] SVGFEFLoodElement-inherit-flood-color-attr.js
-// [Expected rendering result] A simple rect with feFlood filter - and a series of PASS messages
-
-description("Tests dynamic updates of the inherited 'flood-color' attribute of the SVGFEFloodElement object")
-createSVGTestCase();
-
-var floodElement = createSVGElement("feFlood");
-floodElement.setAttribute("flood-color", "inherit");
-floodElement.setAttribute("flood-opacity", ".8");
-
-var filterElement = createSVGElement("filter");
-filterElement.setAttribute("id", "myFilter");
-filterElement.setAttribute("filterUnits", "userSpaceOnUse");
-filterElement.setAttribute("x", "0");
-filterElement.setAttribute("y", "0");
-filterElement.setAttribute("width", "200");
-filterElement.setAttribute("height", "200");
-filterElement.setAttribute("style", "flood-color:rgb(145, 32, 103)");
-filterElement.appendChild(floodElement);
-
-var defsElement = createSVGElement("defs");
-defsElement.appendChild(filterElement);
-
-rootSVGElement.appendChild(defsElement);
-rootSVGElement.setAttribute("width", "700");
-rootSVGElement.setAttribute("height", "200");
-
-var rectElement = createSVGElement("rect");
-rectElement.setAttribute("x", 60);
-rectElement.setAttribute("y", 100);
-rectElement.setAttribute("width", 100);
-rectElement.setAttribute("height", 100);
-rectElement.setAttribute("stroke", "#AF1E9D");
-rectElement.setAttribute("stroke-width", "8");
-rectElement.setAttribute("filter", "url(#myFilter)");
-rootSVGElement.appendChild(rectElement);
-
-shouldBeEqualToString("document.defaultView.getComputedStyle(floodElement).getPropertyValue('flood-color')", "rgb(145, 32, 103)");
-
-function executeTest() {
-    filterElement.setAttribute("style", "flood-color:rgb(64, 128, 103)");
-    shouldBeEqualToString("document.defaultView.getComputedStyle(floodElement).getPropertyValue('flood-color')", "rgb(64, 128, 103)");
-
-    completeTest();
-}
-
-startTest(rootSVGElement, 100, 100);
-
-var successfullyParsed = true;
diff --git a/LayoutTests/svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.js b/LayoutTests/svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.js
deleted file mode 100644 (file)
index 6643390..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// [Name] SVGFESpecularLightingElement-inhertit-lighting-color-css-prop.js
-// [Expected rendering result] A shining circle - and a series of PASS messages
-
-description("Tests dynamic updates of the inherited 'lighting-color' attribute of the SVGFESpecularLightingElement object")
-createSVGTestCase();
-
-var distantElement = createSVGElement("feDistantLight");
-distantElement.setAttribute("azimuth", "45");
-distantElement.setAttribute("elevation", "45");
-
-var specularElement = createSVGElement("feSpecularLighting");
-specularElement.setAttribute("in", "SourceGraphic");
-specularElement.setAttribute("specularConstant", "1");
-specularElement.setAttribute("specularExponent", "1");
-specularElement.setAttribute("surfaceScale", "1");
-specularElement.setAttribute("lighting-color", "inherit");
-specularElement.appendChild(distantElement);
-
-var filterElement = createSVGElement("filter");
-filterElement.setAttribute("id", "myFilter");
-filterElement.setAttribute("filterUnits", "objectBoundingBox");
-filterElement.setAttribute("x", "0%");
-filterElement.setAttribute("y", "0%");
-filterElement.setAttribute("width", "100%");
-filterElement.setAttribute("height", "100%");
-filterElement.setAttribute("style", "lighting-color:red");
-filterElement.appendChild(specularElement);
-
-var defsElement = createSVGElement("defs");
-defsElement.appendChild(filterElement);
-
-rootSVGElement.appendChild(defsElement);
-rootSVGElement.setAttribute("width", "200");
-rootSVGElement.setAttribute("height", "200");
-
-var gElement = createSVGElement("g");
-gElement.setAttribute("fill", "black");
-
-var backgroundElement = createSVGElement("rect");
-backgroundElement.setAttribute("x", 60);
-backgroundElement.setAttribute("y", 20);
-backgroundElement.setAttribute("width", 100);
-backgroundElement.setAttribute("height", 60);
-gElement.appendChild(backgroundElement);
-rootSVGElement.appendChild(gElement);
-
-var imageElement = createSVGElement("image");
-imageElement.setAttribute("x", 60);
-imageElement.setAttribute("y", 20);
-imageElement.setAttribute("width", 100);
-imageElement.setAttribute("height", 60);
-imageElement.setAttributeNS(xlinkNS, "xlink:href", "../W3C-SVG-1.1/resources/bumpMap2.png");
-imageElement.setAttribute("filter", "url(#myFilter)");
-rootSVGElement.appendChild(imageElement);
-
-shouldBeEqualToString("document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color')", "rgb(255, 0, 0)");
-
-function executeTest() {
-    filterElement.setAttribute("style", "lighting-color:rgb(173, 255, 47)");
-    shouldBeEqualToString("document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color')", "rgb(173, 255, 47)");
-
-    completeTest();
-}
-
-startTest(rootSVGElement, 100, 100);
-
-var successfullyParsed = true;
diff --git a/LayoutTests/svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-lighting-color-css-prop.js b/LayoutTests/svg/dynamic-updates/script-tests/SVGFESpecularLightingElement-lighting-color-css-prop.js
deleted file mode 100644 (file)
index 088150c..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-// [Name] SVGFESpecularLightingElement-lighting-color-css-prop.js
-// [Expected rendering result] A shining circle - and a series of PASS messages
-
-description("Tests dynamic updates of the 'lighting-color' attribute of the SVGFESpecularLightingElement object")
-createSVGTestCase();
-
-var distantElement = createSVGElement("feDistantLight");
-distantElement.setAttribute("azimuth", "45");
-distantElement.setAttribute("elevation", "45");
-
-var specularElement = createSVGElement("feSpecularLighting");
-specularElement.setAttribute("in", "SourceGraphic");
-specularElement.setAttribute("specularConstant", "1");
-specularElement.setAttribute("specularExponent", "1");
-specularElement.setAttribute("surfaceScale", "1");
-specularElement.setAttribute("lighting-color", "rgb(255, 255, 0)");
-specularElement.appendChild(distantElement);
-
-var filterElement = createSVGElement("filter");
-filterElement.setAttribute("id", "myFilter");
-filterElement.setAttribute("filterUnits", "objectBoundingBox");
-filterElement.setAttribute("x", "0%");
-filterElement.setAttribute("y", "0%");
-filterElement.setAttribute("width", "100%");
-filterElement.setAttribute("height", "100%");
-filterElement.appendChild(specularElement);
-
-var defsElement = createSVGElement("defs");
-defsElement.appendChild(filterElement);
-
-rootSVGElement.appendChild(defsElement);
-rootSVGElement.setAttribute("width", "200");
-rootSVGElement.setAttribute("height", "200");
-
-var gElement = createSVGElement("g");
-gElement.setAttribute("fill", "black");
-
-var backgroundElement = createSVGElement("rect");
-backgroundElement.setAttribute("x", 60);
-backgroundElement.setAttribute("y", 20);
-backgroundElement.setAttribute("width", 100);
-backgroundElement.setAttribute("height", 60);
-gElement.appendChild(backgroundElement);
-rootSVGElement.appendChild(gElement);
-
-var imageElement = createSVGElement("image");
-imageElement.setAttribute("x", 60);
-imageElement.setAttribute("y", 20);
-imageElement.setAttribute("width", 100);
-imageElement.setAttribute("height", 60);
-imageElement.setAttributeNS(xlinkNS, "xlink:href", "../W3C-SVG-1.1/resources/bumpMap2.png");
-imageElement.setAttribute("filter", "url(#myFilter)");
-rootSVGElement.appendChild(imageElement);
-
-shouldBeEqualToString("document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color')", "rgb(255, 255, 0)");
-
-function executeTest() {
-    specularElement.style.setProperty("lighting-color", "greenyellow", "");
-    shouldBeEqualToString("document.defaultView.getComputedStyle(specularElement).getPropertyValue('lighting-color')", "rgb(173, 255, 47)");
-
-    completeTest();
-}
-
-startTest(rootSVGElement, 100, 100);
-
-var successfullyParsed = true;
index d406265..53aa9c5 100644 (file)
@@ -1,3 +1,29 @@
+2011-03-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r82565.
+        http://trac.webkit.org/changeset/82565
+        https://bugs.webkit.org/show_bug.cgi?id=57541
+
+        Caused assertion failures. (Requested by bbandix on #webkit).
+
+        * platform/graphics/filters/FEFlood.cpp:
+        (WebCore::FEFlood::setFloodColor):
+        (WebCore::FEFlood::setFloodOpacity):
+        * platform/graphics/filters/FEFlood.h:
+        * platform/graphics/filters/FESpecularLighting.cpp:
+        (WebCore::FESpecularLighting::setLightingColor):
+        * platform/graphics/filters/FESpecularLighting.h:
+        * rendering/svg/RenderSVGResourceFilterPrimitive.cpp:
+        * rendering/svg/RenderSVGResourceFilterPrimitive.h:
+        * rendering/svg/SVGResourcesCache.cpp:
+        (WebCore::SVGResourcesCache::clientStyleChanged):
+        * svg/SVGFEDiffuseLightingElement.cpp:
+        (WebCore::SVGFEDiffuseLightingElement::setFilterEffectAttribute):
+        * svg/SVGFEFloodElement.cpp:
+        * svg/SVGFEFloodElement.h:
+        * svg/SVGFESpecularLightingElement.cpp:
+        (WebCore::SVGFESpecularLightingElement::setFilterEffectAttribute):
+
 2011-03-31  Renata Hodovan  <reni@webkit.org>
 
         Reviewed by Dirk Schulze.
index d832d2b..3c48cf9 100644 (file)
@@ -49,12 +49,9 @@ Color FEFlood::floodColor() const
     return m_floodColor;
 }
 
-bool FEFlood::setFloodColor(const Color& color)
+void FEFlood::setFloodColor(const Color& color)
 {
-    if (m_floodColor == color)
-        return false;
     m_floodColor = color;
-    return true;
 }
 
 float FEFlood::floodOpacity() const
@@ -62,12 +59,9 @@ float FEFlood::floodOpacity() const
     return m_floodOpacity;
 }
 
-bool FEFlood::setFloodOpacity(float floodOpacity)
+void FEFlood::setFloodOpacity(float floodOpacity)
 {
-    if (m_floodOpacity == floodOpacity)
-        return false;
     m_floodOpacity = floodOpacity;
-    return true;
 }
 
 void FEFlood::apply()
index cac4153..2e8824f 100644 (file)
@@ -34,10 +34,10 @@ public:
     static PassRefPtr<FEFlood> create(Filter* filter, const Color&, float);
 
     Color floodColor() const;
-    bool setFloodColor(const Color &);
+    void setFloodColor(const Color &);
 
     float floodOpacity() const;
-    bool setFloodOpacity(float);
+    void setFloodOpacity(float);
 
     virtual void apply();
     virtual void dump();
index 2c7b1eb..a20eb8c 100644 (file)
@@ -54,12 +54,9 @@ Color FESpecularLighting::lightingColor() const
     return m_lightingColor;
 }
 
-bool FESpecularLighting::setLightingColor(const Color& lightingColor)
+void FESpecularLighting::setLightingColor(const Color& lightingColor)
 {
-    if (m_lightingColor == lightingColor)
-        return false;
     m_lightingColor = lightingColor;
-    return true;
 }
 
 float FESpecularLighting::surfaceScale() const
index 9fa3add..9d3ea2d 100644 (file)
@@ -34,7 +34,7 @@ public:
     virtual ~FESpecularLighting();
 
     Color lightingColor() const;
-    bool setLightingColor(const Color&);
+    void setLightingColor(const Color&);
 
     float surfaceScale() const;
     bool setSurfaceScale(float);
index 5f3f897..64df700 100644 (file)
@@ -1,7 +1,6 @@
 /*
  * Copyright (C) 2010 University of Szeged
  * Copyright (C) 2010 Zoltan Herczeg
- * Copyright (C) 2011 Renata Hodovan (reni@webkit.org)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 #include "RenderSVGResource.h"
 #include "SVGFEImage.h"
 #include "SVGFilter.h"
-#include "SVGNames.h"
 
 namespace WebCore {
 
-
-void RenderSVGResourceFilterPrimitive::styleDidChange(StyleDifference diff, const RenderStyle* style)
-{
-    RenderSVGHiddenContainer::styleDidChange(diff, style);
-
-    RenderObject* filter = parent();
-    ASSERT(filter && filter->isSVGResourceFilter());
-    if (diff == StyleDifferenceEqual)
-        return;
-
-    const SVGRenderStyle* oldStyle = this->style()->svgStyle();
-    RenderSVGResourceFilter* resourceFilter = static_cast<RenderSVGResourceFilter*>(filter);
-    if (oldStyle->floodColor() != style->svgStyle()->floodColor())
-        resourceFilter->primitiveAttributeChanged(this, SVGNames::flood_colorAttr);
-    if (oldStyle->floodOpacity() != style->svgStyle()->floodOpacity())
-        resourceFilter->primitiveAttributeChanged(this, SVGNames::flood_opacityAttr);
-    if (oldStyle->lightingColor() != style->svgStyle()->lightingColor())
-        resourceFilter->primitiveAttributeChanged(this, SVGNames::lighting_colorAttr);
-}
-
 FloatRect RenderSVGResourceFilterPrimitive::determineFilterPrimitiveSubregion(FilterEffect* effect)
 {
     FloatRect uniteRect;
index e8e4efc..8176d29 100644 (file)
@@ -43,8 +43,6 @@ public:
     {
     }
 
-    virtual void styleDidChange(StyleDifference, const RenderStyle*);
-
     virtual const char* renderName() const { return "RenderSVGResourceFilterPrimitive"; }
     virtual bool isSVGResourceFilterPrimitive() const { return true; }
 
index 453e385..886f76a 100644 (file)
@@ -126,10 +126,6 @@ void SVGResourcesCache::clientStyleChanged(RenderObject* renderer, StyleDifferen
     if (diff == StyleDifferenceEqual)
         return;
 
-    // In this case the proper SVGFE*Element will deceide whether the modifided CSS properties implies a relayout or repaint.
-    if (renderer->isSVGResourceFilterPrimitive() && diff == StyleDifferenceRepaint)
-        return;
-
     clientUpdatedFromElement(renderer, newStyle);
     RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer, false);
 }
index 9f2b0cf..a4c2a6b 100644 (file)
@@ -87,13 +87,14 @@ void SVGFEDiffuseLightingElement::parseMappedAttribute(Attribute* attr)
 bool SVGFEDiffuseLightingElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
 {
     FEDiffuseLighting* diffuseLighting = static_cast<FEDiffuseLighting*>(effect);
-
-    if (attrName == SVGNames::lighting_colorAttr)
-        return diffuseLighting->setLightingColor(this->renderer()->style()->svgStyle()->lightingColor());
     if (attrName == SVGNames::surfaceScaleAttr)
         return diffuseLighting->setSurfaceScale(surfaceScale());
     if (attrName == SVGNames::diffuseConstantAttr)
         return diffuseLighting->setDiffuseConstant(diffuseConstant());
+    if (attrName == SVGNames::lighting_colorAttr) {
+        RefPtr<RenderStyle> filterStyle = styleForRenderer();
+        return diffuseLighting->setLightingColor(filterStyle->svgStyle()->lightingColor());
+    }
 
     LightSource* lightSource = const_cast<LightSource*>(diffuseLighting->lightSource());
     const SVGFELightElement* lightElement = SVGFELightElement::findLightElement(this);
index 8d66658..eb20927 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "Attribute.h"
 #include "RenderStyle.h"
-#include "SVGNames.h"
 #include "SVGRenderStyle.h"
 
 namespace WebCore {
@@ -40,21 +39,6 @@ PassRefPtr<SVGFEFloodElement> SVGFEFloodElement::create(const QualifiedName& tag
     return adoptRef(new SVGFEFloodElement(tagName, document));
 }
 
-
-bool SVGFEFloodElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
-{
-    RenderStyle* style = this->renderer()->style();
-    FEFlood* flood = static_cast<FEFlood*>(effect);
-
-    if (attrName == SVGNames::flood_colorAttr)
-        return flood->setFloodColor(style->svgStyle()->floodColor());
-    if (attrName == SVGNames::flood_opacityAttr)
-        return flood->setFloodOpacity(style->svgStyle()->floodOpacity());
-
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
 PassRefPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*, Filter* filter)
 {
     RefPtr<RenderStyle> filterStyle = styleForRenderer();
index e98e7b3..f7c7987 100644 (file)
@@ -36,7 +36,6 @@ private:
 
     virtual void fillAttributeToPropertyTypeMap();
     virtual AttributeToPropertyTypeMap& attributeToPropertyTypeMap();
-    virtual bool setFilterEffectAttribute(FilterEffect*, const QualifiedName& attrName);
     virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
 };
 
index afa1df1..60684ed 100644 (file)
@@ -92,9 +92,6 @@ void SVGFESpecularLightingElement::parseMappedAttribute(Attribute* attr)
 bool SVGFESpecularLightingElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
 {
     FESpecularLighting* specularLighting = static_cast<FESpecularLighting*>(effect);
-
-    if (attrName == SVGNames::lighting_colorAttr)
-        return specularLighting->setLightingColor(this->renderer()->style()->svgStyle()->lightingColor());
     if (attrName == SVGNames::surfaceScaleAttr)
         return specularLighting->setSurfaceScale(surfaceScale());
     if (attrName == SVGNames::specularConstantAttr)