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

Wed Dec 22 13:13:58 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 002260f58b47cfa35d1a51e6ba520d25d32091ba
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 10:16:42 2010 +0000

    2010-09-09  Luke Macpherson  <macpherson at chromium.org>
    
            Reviewed by James Robinson.
    
            Add test for percent height image inside floated element.
            https://bugs.webkit.org/show_bug.cgi?id=45366
    
            * fast/images/percent-height-image-expected.txt: Added.
            * fast/images/percent-height-image.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67075 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f08b724..6b07350 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-09  Luke Macpherson  <macpherson at chromium.org>
+
+        Reviewed by James Robinson.
+
+        Add test for percent height image inside floated element.
+        https://bugs.webkit.org/show_bug.cgi?id=45366
+
+        * fast/images/percent-height-image-expected.txt: Added.
+        * fast/images/percent-height-image.html: Added.
+
 2010-09-09  Fumitoshi Ukai  <ukai at chromium.org>
 
         Unreviewed.
diff --git a/LayoutTests/fast/images/percent-height-image-expected.txt b/LayoutTests/fast/images/percent-height-image-expected.txt
new file mode 100644
index 0000000..f28430e
--- /dev/null
+++ b/LayoutTests/fast/images/percent-height-image-expected.txt
@@ -0,0 +1,4 @@
+Tests that an image with height 100% inside a floated div keeps its intrinsic height.
+See Bug: http://bugs.webkit.org/show_bug.cgi?id=45439
+
+FAIL: image height was 600 expected 20
diff --git a/LayoutTests/fast/images/percent-height-image.html b/LayoutTests/fast/images/percent-height-image.html
new file mode 100644
index 0000000..f0f7c3a
--- /dev/null
+++ b/LayoutTests/fast/images/percent-height-image.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<div>
+    Tests that an image with height 100% inside a floated div keeps its intrinsic height.<br/>
+    See Bug: http://bugs.webkit.org/show_bug.cgi?id=45439</div>
+<div style="float: left;">
+    <!-- src is a 20 x 20 PNG -->
+    <img style="height: 100%; width: 100%;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMAUExURQ//W/8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPzdRA4AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjLX7mlDAAAAaUlEQVQoU23QQQ4AIQgDQPD/j5ZSCkYlxsPoSlnzT5mvu8yBjoPcULaAYG60RFxrDHsQVshvY6URsw8WjY2isnuZ3lTfudn5NEVFYmbN0BjWcYWVpU44kbKc2Hbg2KBMMyC85ph/HfipDQwyAn26rjFKAAAAAElFTkSuQmCC"/>
+</div>
+<pre></pre>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    var expected = 20;
+    var actual = document.querySelector("img").offsetHeight;
+    var out = document.querySelector("pre");
+    if (actual == expected)
+        out.textContent = "PASS";
+    else
+        out.textContent = "FAIL: image height was " + actual + " expected " + expected;
+</script>

-- 
WebKit Debian packaging

