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

Wed Dec 22 11:46:05 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit acfadc42d2ac0783a2d5e253ca8a052acff13f51
Author: benm at google.com <benm at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 05:57:08 2010 +0000

    2010-08-05  Ben Murdoch  <benm at google.com>
    
            Reviewed by Simon Fraser.
    
            Form button input elements lacking text in some cases after switching from visibility:collapse to visibility:visible
            https://bugs.webkit.org/show_bug.cgi?id=38050
    
            * fast/css/visibility-collapse-form-buttons-expected.txt: Added.
            * fast/css/visibility-collapse-form-buttons.html: Added.
    2010-08-05  Ben Murdoch  <benm at google.com>
    
            Reviewed by Simon Fraser.
    
            Form button input elements lacking text in some cases after switching from
            visibility:collapse to visibility:visible
            https://bugs.webkit.org/show_bug.cgi?id=38050
    
            A relayout is required after toggling visibility from collapse to another value.
    
            Test: fast/css/visibility-collapse-form-buttons.html
    
            * rendering/style/RenderStyle.cpp:
            (WebCore::RenderStyle::diff): If we're toggling from visibility:collapse to another
                visibility value (or vice versa) then we need to trigger a relayout.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64819 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ed1c089..8b2d295 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-05  Ben Murdoch  <benm at google.com>
+
+        Reviewed by Simon Fraser.
+
+        Form button input elements lacking text in some cases after switching from visibility:collapse to visibility:visible
+        https://bugs.webkit.org/show_bug.cgi?id=38050
+
+        * fast/css/visibility-collapse-form-buttons-expected.txt: Added.
+        * fast/css/visibility-collapse-form-buttons.html: Added.
+
 2010-08-05  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/css/visibility-collapse-form-buttons-expected.txt b/LayoutTests/fast/css/visibility-collapse-form-buttons-expected.txt
new file mode 100644
index 0000000..eb502eb
--- /dev/null
+++ b/LayoutTests/fast/css/visibility-collapse-form-buttons-expected.txt
@@ -0,0 +1,5 @@
+The two buttons below should say PASS:
+
+
+
+PASS
diff --git a/LayoutTests/fast/css/visibility-collapse-form-buttons.html b/LayoutTests/fast/css/visibility-collapse-form-buttons.html
new file mode 100644
index 0000000..a99ad1a
--- /dev/null
+++ b/LayoutTests/fast/css/visibility-collapse-form-buttons.html
@@ -0,0 +1,31 @@
+<html>
+<head>
+<title>Test for bug 38050</title>
+</head>
+<body>
+<p>The two buttons below should say PASS:</p>
+<div id='collapseDiv' style='visibility: collapse;'>
+    <input type='button' value='PASS' id='collapseButton' />
+</div>
+<div>
+    <input type='button' value='PASS' id='visibilityButton' />
+</div>
+
+<div id='console'></div>
+
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+document.body.offsetTop; // Force layout.
+document.getElementById("collapseDiv").style.visibility='visible'
+
+// The two buttons should have the same width.
+if (document.getElementById('collapseButton').clientWidth == document.getElementById('visibilityButton').clientWidth)
+    document.getElementById('console').innerText = 'PASS';
+else
+    document.getElementById('console').innerText = 'FAIL';
+
+</script> 
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 46a08ff..69554b1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-05  Ben Murdoch  <benm at google.com>
+
+        Reviewed by Simon Fraser.
+
+        Form button input elements lacking text in some cases after switching from
+        visibility:collapse to visibility:visible
+        https://bugs.webkit.org/show_bug.cgi?id=38050
+        
+        A relayout is required after toggling visibility from collapse to another value.
+
+        Test: fast/css/visibility-collapse-form-buttons.html
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff): If we're toggling from visibility:collapse to another
+            visibility value (or vice versa) then we need to trigger a relayout.
+
 2010-08-05  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/rendering/style/RenderStyle.cpp b/WebCore/rendering/style/RenderStyle.cpp
index 4cde08b..5a66c67 100644
--- a/WebCore/rendering/style/RenderStyle.cpp
+++ b/WebCore/rendering/style/RenderStyle.cpp
@@ -472,6 +472,9 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon
         return StyleDifferenceLayout;
     }
 
+    if ((visibility() == COLLAPSE) != (other->visibility() == COLLAPSE))
+        return StyleDifferenceLayout;
+
     // Make sure these left/top/right/bottom checks stay below all layout checks and above
     // all visible checks.
     if (position() != StaticPosition) {

-- 
WebKit Debian packaging

