[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Wed Apr 7 23:48:52 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit ca987991862b83a0a8fae39c5c5dee58bcb89571
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 08:15:42 2009 +0000

    Update the test fast/overflow/004.html to make it match the test
    description and expected results.
    https://bugs.webkit.org/show_bug.cgi?id=31455
    
    Patch by Kinuko Yasuda <kinuko at google.com> on 2009-11-19
    Reviewed by Dan Bernstein.
    
    * fast/overflow/004.html:
    * platform/mac/fast/overflow/004-expected.checksum:
    * platform/mac/fast/overflow/004-expected.png:
    * platform/mac/fast/overflow/004-expected.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f2c66e2..445cfa0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-19  Kinuko Yasuda  <kinuko at google.com>
+
+        Reviewed by Dan Bernstein.
+
+        Update the test fast/overflow/004.html to make it match the test
+        description and expected results.
+        https://bugs.webkit.org/show_bug.cgi?id=31455
+
+        * fast/overflow/004.html:
+        * platform/mac/fast/overflow/004-expected.checksum:
+        * platform/mac/fast/overflow/004-expected.png:
+        * platform/mac/fast/overflow/004-expected.txt:
+
 2009-11-18  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/overflow/004.html b/LayoutTests/fast/overflow/004.html
index 7daee33..4ca1c1b 100644
--- a/LayoutTests/fast/overflow/004.html
+++ b/LayoutTests/fast/overflow/004.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <body>
 The two green blocks below should be identical and should each take up half the width of the browser window.
-<div style="border:1px solid black; width:50%; height:500px; background-color:green; float:right"></div>
-<div style="border:1px solid black; width:50%; height:500px; background-color:green;overflow:hidden"></div> 
+<div style="border:1px solid black; width:50%; height:500px; background-color:green; float:right; -webkit-box-sizing:border-box;"></div>
+<div style="border:1px solid black; width:50%; height:500px; background-color:green; overflow:hidden; -webkit-box-sizing:border-box;"></div>
 </body>
 </html>
 
diff --git a/LayoutTests/platform/mac/fast/overflow/004-expected.checksum b/LayoutTests/platform/mac/fast/overflow/004-expected.checksum
index a1e6d94..b47623b 100644
--- a/LayoutTests/platform/mac/fast/overflow/004-expected.checksum
+++ b/LayoutTests/platform/mac/fast/overflow/004-expected.checksum
@@ -1 +1 @@
-e31e1d829e8e8eb8e45f513ce4833f87
\ No newline at end of file
+8d5c227b14ff98d4b2f63de8fd4b9b10
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/overflow/004-expected.png b/LayoutTests/platform/mac/fast/overflow/004-expected.png
index 02d535c..7bfdbfb 100644
Binary files a/LayoutTests/platform/mac/fast/overflow/004-expected.png and b/LayoutTests/platform/mac/fast/overflow/004-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/overflow/004-expected.txt b/LayoutTests/platform/mac/fast/overflow/004-expected.txt
index ae1af72..7961c14 100644
--- a/LayoutTests/platform/mac/fast/overflow/004-expected.txt
+++ b/LayoutTests/platform/mac/fast/overflow/004-expected.txt
@@ -1,12 +1,12 @@
-layer at (0,0) size 785x1038
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1038
-  RenderBlock {HTML} at (0,0) size 785x1038
-    RenderBody {BODY} at (8,8) size 769x1022
-      RenderBlock (anonymous) at (0,0) size 769x18
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x534
+  RenderBlock {HTML} at (0,0) size 800x534
+    RenderBody {BODY} at (8,8) size 784x518
+      RenderBlock (anonymous) at (0,0) size 784x18
         RenderText {#text} at (0,0) size 704x18
           text run at (0,0) width 704: "The two green blocks below should be identical and should each take up half the width of the browser window."
-        RenderBlock (floating) {DIV} at (383,18) size 386x502 [bgcolor=#008000] [border: (1px solid #000000)]
+        RenderBlock (floating) {DIV} at (392,18) size 392x500 [bgcolor=#008000] [border: (1px solid #000000)]
         RenderText {#text} at (0,0) size 0x0
-layer at (8,528) size 386x502 clip at (9,529) size 384x500
-  RenderBlock {DIV} at (0,520) size 386x502 [bgcolor=#008000] [border: (1px solid #000000)]
+layer at (8,26) size 392x500 clip at (9,27) size 390x498
+  RenderBlock {DIV} at (0,18) size 392x500 [bgcolor=#008000] [border: (1px solid #000000)]

-- 
WebKit Debian packaging

