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

zimmermann at webkit.org zimmermann at webkit.org
Wed Dec 22 12:28:32 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit dca5d1fe1dfa919f5aad8bdb56f6c50ad4719584
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 14:00:41 2010 +0000

    2010-08-24  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            -webkit-svg-shadow doesn't repaint on changes
            https://bugs.webkit.org/show_bug.cgi?id=44521
    
            Trivial fix, to make -webkit-svg-shadow react on changes.
    
            Test: svg/css/shadow-changes.svg
    
            * rendering/style/SVGRenderStyle.cpp:
            (WebCore::SVGRenderStyle::diff): If 'svgShadow' is not equal, cause a repaint.
    
    2010-08-24  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            -webkit-svg-shadow doesn't repaint on changes
            https://bugs.webkit.org/show_bug.cgi?id=44521
    
            * platform/mac/svg/css/shadow-changes-expected.checksum: Added.
            * platform/mac/svg/css/shadow-changes-expected.png: Added.
            * platform/mac/svg/css/shadow-changes-expected.txt: Added.
            * svg/css/shadow-changes.svg: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65895 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c5c105a..fceeb54 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-24  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        -webkit-svg-shadow doesn't repaint on changes
+        https://bugs.webkit.org/show_bug.cgi?id=44521
+
+        * platform/mac/svg/css/shadow-changes-expected.checksum: Added.
+        * platform/mac/svg/css/shadow-changes-expected.png: Added.
+        * platform/mac/svg/css/shadow-changes-expected.txt: Added.
+        * svg/css/shadow-changes.svg: Added.
+
 2010-08-24  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed trivial fix.
diff --git a/LayoutTests/platform/mac/svg/css/shadow-changes-expected.checksum b/LayoutTests/platform/mac/svg/css/shadow-changes-expected.checksum
new file mode 100644
index 0000000..8595cc5
--- /dev/null
+++ b/LayoutTests/platform/mac/svg/css/shadow-changes-expected.checksum
@@ -0,0 +1 @@
+55185e30f6b7caeaab136bf2e3846253
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/css/shadow-changes-expected.png b/LayoutTests/platform/mac/svg/css/shadow-changes-expected.png
new file mode 100644
index 0000000..b9fe427
Binary files /dev/null and b/LayoutTests/platform/mac/svg/css/shadow-changes-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/css/shadow-changes-expected.txt b/LayoutTests/platform/mac/svg/css/shadow-changes-expected.txt
new file mode 100644
index 0000000..99bf09c
--- /dev/null
+++ b/LayoutTests/platform/mac/svg/css/shadow-changes-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 755x302
+  RenderSVGRoot {svg} at (135,5) size 326x285
+    RenderSVGContainer {g} at (120,0) size 341x290
+      RenderPath {rect} at (135,5) size 215x215 [fill={[type=SOLID] [color=#FF0000]}] [data="M150.00,20.00 L350.00,20.00 L350.00,220.00 L150.00,220.00 Z"]
+      RenderPath {circle} at (205,75) size 215x215 [fill={[type=SOLID] [color=#0000FF]}] [data="M420.00,190.00 L419.80,196.28 L419.21,202.53 L418.23,208.74 L416.86,214.87 L415.11,220.90 L412.98,226.81 L410.48,232.58 L407.63,238.18 L404.43,243.58 L400.90,248.78 L397.05,253.74 L392.90,258.45 L388.45,262.90 L383.74,267.05 L378.78,270.90 L373.58,274.43 L368.18,277.63 L362.58,280.48 L356.81,282.98 L350.90,285.11 L344.87,286.86 L338.74,288.23 L332.53,289.21 L326.28,289.80 L320.00,290.00 L313.72,289.80 L307.47,289.21 L301.26,288.23 L295.13,286.86 L289.10,285.11 L283.19,282.98 L277.42,280.48 L271.82,277.63 L266.42,274.43 L261.22,270.90 L256.26,267.05 L251.55,262.90 L247.10,258.45 L242.95,253.74 L239.10,248.78 L235.57,243.58 L232.37,238.18 L229.52,232.58 L227.02,226.81 L224.89,220.90 L223.14,214.87 L221.77,208.74 L220.79,202.53 L220.20,196.28 L220.00,190.00 L220.20,183.72 L220.79,177.47 L221.77,171.26 L223.14,165.13 L224.89,159.10 L227.02,153.19 L229.52,147.42 L232.37,141.82 L235.57,136.42 L239.10,131.22 L242.95,126.26 L247.10,121.55 L251.55,117.10 L256.26,112.95 L261.22,109.10 L266.42,105.57 L271.82,102.37 L277.42,99.52 L283.19,97.02 L289.10,94.89 L295.13,93.14 L301.26,91.77 L307.47,90.79 L313.72,90.20 L320.00,90.00 L326.28,90.20 L332.53,90.79 L338.74,91.77 L344.87,93.14 L350.90,94.89 L356.81,97.02 L362.58,99.52 L368.18,102.37 L373.58,105.57 L378.78,109.10 L383.74,112.95 L388.45,117.10 L392.90,121.55 L397.05,126.26 L400.90,131.22 L404.43,136.42 L407.63,141.82 L410.48,147.42 L412.98,153.19 L415.11,159.10 L416.86,165.13 L418.23,171.26 L419.21,177.47 L419.80,183.72 Z"]
+      RenderSVGText {text} at (270,36) size 191x107 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 191x107
+          chunk 1 text run 1 at (270.00,120.00) startOffset 0 endOffset 3 width 191.00: "SVG"
diff --git a/LayoutTests/svg/css/shadow-changes.svg b/LayoutTests/svg/css/shadow-changes.svg
new file mode 100644
index 0000000..77fe13e
--- /dev/null
+++ b/LayoutTests/svg/css/shadow-changes.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+<g id="svg-shadow-example" style="-webkit-svg-shadow: rgba(106,119,64, 0.7) 5px 5px 9px;">
+    <rect x="150" y="20" width="200" height="200" fill="red"/>
+    <circle cy="190" cx="320" r="100" fill="blue"/>
+    <text x="270" y="120" fill="green" style="font-weight:bold;font-size:70pt;text-shadow:none;">SVG</text>
+</g>
+<script>
+if (window.layoutTestController)
+    layoutTestController.waitUntilDone();
+
+setTimeout(changeShadow, 0);
+
+function changeShadow() {
+    var group = document.getElementsByTagName('g')[0];
+    group.style.WebkitSvgShadow = "rgba(64,64,64, 0.7) -9px -9px 6px";
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+</script>
+</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aabc936..3f7676c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-24  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        -webkit-svg-shadow doesn't repaint on changes
+        https://bugs.webkit.org/show_bug.cgi?id=44521
+
+        Trivial fix, to make -webkit-svg-shadow react on changes.
+
+        Test: svg/css/shadow-changes.svg
+
+        * rendering/style/SVGRenderStyle.cpp:
+        (WebCore::SVGRenderStyle::diff): If 'svgShadow' is not equal, cause a repaint.
+
 2010-08-24  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/rendering/style/SVGRenderStyle.cpp b/WebCore/rendering/style/SVGRenderStyle.cpp
index 0df26f4..dc8a5af 100644
--- a/WebCore/rendering/style/SVGRenderStyle.cpp
+++ b/WebCore/rendering/style/SVGRenderStyle.cpp
@@ -178,6 +178,10 @@ StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const
 
     // NOTE: All comparisions below may only return StyleDifferenceRepaint
 
+    // Shadow changes need to cause repaints.
+    if (shadowSVG != other->shadowSVG)
+        return StyleDifferenceRepaint;
+
     // Painting related properties only need repaints. 
     if (miscNotEqual) {
         if (misc->floodColor != other->misc->floodColor

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list