[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 11:13:27 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 107c3bb70c4ceb188475db7413db88d9abeb946d
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 07:34:13 2010 +0000

    2010-07-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Adam Barth.
    
            Pixel test failure in moving-shadow-on-path.html and moving-shadow-on-container.html
            https://bugs.webkit.org/show_bug.cgi?id=42249
    
            Partly revert <http://trac.webkit.org/changeset/63307>. The RenderSVGRoot change caused a pixel test regression in two fast/repaint tests.
    
            * rendering/RenderSVGRoot.cpp:
            (WebCore::RenderSVGRoot::layout): Include selfNeedsLayout() check in LayoutStateRepainter argument.
    
    2010-07-15  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Adam Barth.
    
            Pixel test failure in moving-shadow-on-path.html and moving-shadow-on-container.html
            https://bugs.webkit.org/show_bug.cgi?id=42249
    
            Update fast/repaint/moving-shadow-on-path.html result, which shows a slightly smaller repaint rect.
    
            * platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum:
            * platform/mac/fast/repaint/moving-shadow-on-path-expected.png:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e99e663..29898e1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Adam Barth.
+
+        Pixel test failure in moving-shadow-on-path.html and moving-shadow-on-container.html
+        https://bugs.webkit.org/show_bug.cgi?id=42249
+
+        Update fast/repaint/moving-shadow-on-path.html result, which shows a slightly smaller repaint rect.
+
+        * platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum:
+        * platform/mac/fast/repaint/moving-shadow-on-path-expected.png:
+
 2010-07-15  Maciej Stachowiak  <mjs at apple.com>
 
         Unreviewed, trivial error in previous commit.
diff --git a/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum b/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum
index 36bf31e..3b3515e 100644
--- a/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum
+++ b/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.checksum
@@ -1 +1 @@
-c1d3ba33405df28796a36d5b1b225097
\ No newline at end of file
+3d148ca8ecc0067a2307da77ac8bf690
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.png b/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.png
index 57212cf..fea921f 100644
Binary files a/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.png and b/LayoutTests/platform/mac/fast/repaint/moving-shadow-on-path-expected.png differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4685c0f..94b31b9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Adam Barth.
+
+        Pixel test failure in moving-shadow-on-path.html and moving-shadow-on-container.html
+        https://bugs.webkit.org/show_bug.cgi?id=42249
+
+        Partly revert <http://trac.webkit.org/changeset/63307>. The RenderSVGRoot change caused a pixel test regression in two fast/repaint tests.
+
+        * rendering/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::layout): Include selfNeedsLayout() check in LayoutStateRepainter argument.
+
 2010-07-14  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r63352.
diff --git a/WebCore/rendering/RenderSVGRoot.cpp b/WebCore/rendering/RenderSVGRoot.cpp
index a121aa1..7713445 100644
--- a/WebCore/rendering/RenderSVGRoot.cpp
+++ b/WebCore/rendering/RenderSVGRoot.cpp
@@ -108,7 +108,8 @@ void RenderSVGRoot::layout()
     // Arbitrary affine transforms are incompatible with LayoutState.
     view()->disableLayoutState();
 
-    LayoutRepainter repainter(*this, m_everHadLayout && checkForRepaintDuringLayout());
+    bool needsLayout = selfNeedsLayout();
+    LayoutRepainter repainter(*this, needsLayout && m_everHadLayout && checkForRepaintDuringLayout());
 
     IntSize oldSize(width(), height());
     calcWidth();
@@ -118,7 +119,7 @@ void RenderSVGRoot::layout()
     SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
     m_isLayoutSizeChanged = svg->hasRelativeLengths() && oldSize != size();
 
-    SVGRenderSupport::layoutChildren(this, selfNeedsLayout());
+    SVGRenderSupport::layoutChildren(this, needsLayout);
     m_isLayoutSizeChanged = false;
 
     repainter.repaintAfterLayout();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list