Modified: branches/safari-536-branch/LayoutTests/ChangeLog (118263 => 118264)
--- branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-23 23:14:13 UTC (rev 118263)
+++ branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-23 23:16:30 UTC (rev 118264)
@@ -1,5 +1,14 @@
2012-05-23 Jessie Berlin <[email protected]>
+ Roll out r116176 on the 536 branch, since r116009 was rolled out on the 536 branch.
+
+ r116176 updated the test in response to the switch to FractionalLayoutUnits, but the
+ LayoutUnits changes were rolled out of the 536 branch.
+
+ * platform/mac/fast/block/float/overhanging-tall-block-expected.txt:
+
+2012-05-23 Jessie Berlin <[email protected]>
+
Roll out 116019 on the 536 branch, since r116009 was rolled out on the 536 branch.
r116019 updated the test in response to the switch to FractionalLayoutUnits, but the
Modified: branches/safari-536-branch/LayoutTests/platform/mac/fast/block/float/overhanging-tall-block-expected.txt (118263 => 118264)
--- branches/safari-536-branch/LayoutTests/platform/mac/fast/block/float/overhanging-tall-block-expected.txt 2012-05-23 23:14:13 UTC (rev 118263)
+++ branches/safari-536-branch/LayoutTests/platform/mac/fast/block/float/overhanging-tall-block-expected.txt 2012-05-23 23:16:30 UTC (rev 118264)
@@ -1,11 +1,11 @@
-layer at (0,0) size 800x1300000028
+layer at (0,0) size 800x1300000018
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x1300000028 backgroundClip at (0,0) size 800x1073741823 clip at (0,0) size 800x1073741823 outlineClip at (0,0) size 800x1073741823
- RenderBlock {HTML} at (0,0) size 800x1300000000
- RenderBody {BODY} at (8,8) size 784x1300000000
+layer at (0,0) size 800x1300000018 backgroundClip at (0,0) size 800x1073741823 clip at (0,0) size 800x1073741823 outlineClip at (0,0) size 800x1073741823
+ RenderBlock {HTML} at (0,0) size 800x1300000018
+ RenderBody {BODY} at (8,8) size 784x1300000002
RenderBlock {DIV} at (0,0) size 784x1300000000
- RenderBlock {DIV} at (0,1300000000) size 784x0
- RenderBlock {DIV} at (0,1300000000) size 784x0
-layer at (10,10) size 161x1300000006 backgroundClip at (10,10) size 161x1073741813 clip at (11,11) size 159x1073741812 outlineClip at (0,0) size 800x1073741823
- RenderTextControl {TEXTAREA} at (2,2) size 161x1300000000 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBlock {DIV} at (0,1300000002) size 784x0
+ RenderBlock {DIV} at (0,1300000004) size 784x0
+layer at (10,0) size 161x1300000006 backgroundClip at (10,0) size 161x1073741823 clip at (11,1) size 159x1073741822 outlineClip at (0,0) size 800x1073741823
+ RenderTextControl {TEXTAREA} at (2,-8) size 161x1300000006 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 155x13
