[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 2d2bdd50f4129edc7440734047eabd9abe40964c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 15:56:57 2011 +0000

    2011-01-18  Leo Yang  <leo.yang at torchmobile.com.cn>
    
            Reviewed by Nikolas Zimmermann.
    
            Unable to indirectly animate visibility of SVGUseElement
            https://bugs.webkit.org/show_bug.cgi?id=50240
    
            Test case to verify if SVGUseElement inherits parent's
            style change.
    
            * svg/custom/use-inherit-style-expected.txt: Added.
            * svg/custom/use-inherit-style.svg: Added.
    2011-01-18  Leo Yang  <leo.yang at torchmobile.com.cn>
    
            Reviewed by Nikolas Zimmermann.
    
            Unable to indirectly animate visibility of SVGUseElement
            https://bugs.webkit.org/show_bug.cgi?id=50240
    
            SVGUseElement::recalcStyle should take care of its shadow
            tree's style recalculation when it is called with change >= Inherit
            or when childNeedsStyleRecalc() is true because in these two
            cases needStyleRecalc() may not be true.
    
            Test: svg/custom/use-inherit-style.svg
    
            * svg/SVGUseElement.cpp:
            (WebCore::SVGUseElement::recalcStyle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index adfefa2..9757418 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-18  Leo Yang  <leo.yang at torchmobile.com.cn>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Unable to indirectly animate visibility of SVGUseElement
+        https://bugs.webkit.org/show_bug.cgi?id=50240
+
+        Test case to verify if SVGUseElement inherits parent's
+        style change.
+
+        * svg/custom/use-inherit-style-expected.txt: Added.
+        * svg/custom/use-inherit-style.svg: Added.
+
 2011-01-18  Pavel Podivilov  <podivilov at chromium.org>
 
         Unreviewed, remove wrong chromium expectation for console-xhr-logging test.
diff --git a/LayoutTests/svg/custom/use-inherit-style-expected.txt b/LayoutTests/svg/custom/use-inherit-style-expected.txt
new file mode 100644
index 0000000..36a6ad9
--- /dev/null
+++ b/LayoutTests/svg/custom/use-inherit-style-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (0,0) size 100x60
+    RenderSVGContainer {g} at (0,0) size 100x60
+      RenderSVGContainer {use} at (0,0) size 100x60
+        RenderSVGContainer {g} at (0,0) size 100x60
+          RenderSVGPath {rect} at (0,0) size 100x60 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=100.00] [height=60.00]
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderSVGPath {rect} at (0,0) size 100x60 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=60.00]
diff --git a/LayoutTests/svg/custom/use-inherit-style.svg b/LayoutTests/svg/custom/use-inherit-style.svg
new file mode 100644
index 0000000..9c44b4a
--- /dev/null
+++ b/LayoutTests/svg/custom/use-inherit-style.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<g id="g">
+    <use xlink:href="#rect" />
+</g>
+
+<defs>
+    <rect id="rect" x="0" y="0" width="100" height="60" />
+</defs>
+
+<script>
+    if (window.layoutTestController)
+        layoutTestController.waitUntilDone();
+
+    function runTest()
+    {
+        document.getElementById("g").setAttribute("fill", "#00FF00");
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    }
+
+    window.setTimeout("runTest()", 0);
+</script>
+
+</svg>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cb64f25..ba795b9 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-18  Leo Yang  <leo.yang at torchmobile.com.cn>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Unable to indirectly animate visibility of SVGUseElement
+        https://bugs.webkit.org/show_bug.cgi?id=50240
+
+        SVGUseElement::recalcStyle should take care of its shadow
+        tree's style recalculation when it is called with change >= Inherit
+        or when childNeedsStyleRecalc() is true because in these two
+        cases needStyleRecalc() may not be true.
+
+        Test: svg/custom/use-inherit-style.svg
+
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::recalcStyle):
+
 2011-01-18  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/svg/SVGUseElement.cpp b/Source/WebCore/svg/SVGUseElement.cpp
index 589a560..9f43f82 100644
--- a/Source/WebCore/svg/SVGUseElement.cpp
+++ b/Source/WebCore/svg/SVGUseElement.cpp
@@ -330,7 +330,7 @@ void SVGUseElement::updateContainerOffsets()
 void SVGUseElement::recalcStyle(StyleChange change)
 {
     // Eventually mark shadow root element needing style recalc
-    if (needsStyleRecalc() && m_targetElementInstance && !m_updatesBlocked) {
+    if ((change >= Inherit || needsStyleRecalc() || childNeedsStyleRecalc()) && m_targetElementInstance && !m_updatesBlocked) {
         if (SVGElement* shadowRoot = m_targetElementInstance->shadowTreeElement())
             shadowRoot->setNeedsStyleRecalc();
     }

-- 
WebKit Debian packaging