Diff
Modified: trunk/LayoutTests/ChangeLog (97661 => 97662)
--- trunk/LayoutTests/ChangeLog 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/LayoutTests/ChangeLog 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1,5 +1,20 @@
2011-10-17 Ojan Vafai <[email protected]>
+ Unreviewed, rolling out r97654.
+ http://trac.webkit.org/changeset/97654
+ https://bugs.webkit.org/show_bug.cgi?id=68497
+
+ Caused a number of Chromium failures.
+
+ * platform/mac/fast/backgrounds/background-leakage-transforms-expected.txt:
+ * platform/mac/fast/table/028-vertical-expected.png:
+ * platform/mac/fast/table/028-vertical-expected.txt:
+ * platform/mac/fast/table/height-percent-test-vertical-expected.png:
+ * platform/mac/fast/table/height-percent-test-vertical-expected.txt:
+ * platform/mac/fast/writing-mode/fallback-orientation-expected.txt:
+
+2011-10-17 Ojan Vafai <[email protected]>
+
Unreviewed, rolling out r97653.
http://trac.webkit.org/changeset/97653
https://bugs.webkit.org/show_bug.cgi?id=69957
Modified: trunk/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.txt (97661 => 97662)
--- trunk/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.txt 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.txt 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x852
+layer at (0,0) size 785x912
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x852
- RenderBlock {HTML} at (0,0) size 785x852
- RenderBody {BODY} at (8,8) size 769x836
+layer at (0,0) size 785x912
+ RenderBlock {HTML} at (0,0) size 785x912
+ RenderBody {BODY} at (8,8) size 769x896
RenderBlock {DIV} at (0,0) size 769x148
RenderBlock {DIV} at (10,10) size 268x128
RenderBlock {DIV} at (12,12) size 110x100 [bgcolor=#000000] [border: (20px solid #FFFFFF)]
@@ -36,8 +36,8 @@
RenderBlock {DIV} at (146,12) size 110x100 [bgcolor=#FFFFFF] [border: (20px double #0000FF7F)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (8,304) size 158x540
- RenderBlock {DIV} at (0,296) size 158x540
+layer at (8,304) size 158x600
+ RenderBlock {DIV} at (0,296) size 158x600
RenderBlock {DIV} at (10,10) size 138x248
RenderBlock {DIV} at (16,12) size 110x100 [bgcolor=#000000] [border: (20px solid #FFFFFF)]
RenderText {#text} at (2,122) size 18x4
Modified: trunk/LayoutTests/platform/mac/fast/table/028-vertical-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/table/028-vertical-expected.txt (97661 => 97662)
--- trunk/LayoutTests/platform/mac/fast/table/028-vertical-expected.txt 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/LayoutTests/platform/mac/fast/table/028-vertical-expected.txt 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1,12 +1,12 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock (anonymous) at (0,0) size 784x18
+layer at (0,0) size 785x634
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x634
+ RenderBlock {HTML} at (0,0) size 785x634
+ RenderBody {BODY} at (8,8) size 769x618
+ RenderBlock (anonymous) at (0,0) size 769x18
RenderText {#text} at (0,0) size 277x18
text run at (0,0) width 277: "These two tables should be the same height."
- RenderBlock {DIV} at (0,18) size 78x320
+ RenderBlock {DIV} at (0,18) size 78x600
RenderTable {TABLE} at (0,0) size 22x320
RenderTableSection {TBODY} at (0,0) size 22x320
RenderTableRow {TR} at (0,0) size 22x320
@@ -18,7 +18,7 @@
text run at (1,1) width 8: "2"
RenderTableCell {TD} at (0,314) size 22x6 [border: (1px solid #008000)] [r=0 c=2 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 20x4 [bgcolor=#FFA500]
- RenderBlock {P} at (38,0) size 0x320
+ RenderBlock {P} at (38,0) size 0x600
RenderTable {TABLE} at (38,0) size 40x320
RenderTableSection {TBODY} at (0,0) size 40x320
RenderTableRow {TR} at (0,0) size 20x320
Modified: trunk/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt (97661 => 97662)
--- trunk/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1,24 +1,24 @@
-layer at (0,0) size 1282x585
- RenderView at (0,0) size 800x585
-layer at (0,0) size 800x585
- RenderBlock {HTML} at (0,0) size 800x585
- RenderBody {BODY} at (8,8) size 784x569
- RenderBlock {DIV} at (0,0) size 1274x134
- RenderBlock {DIV} at (16,16) size 26x102 [border: (1px solid #000000)]
+layer at (0,0) size 1282x601
+ RenderView at (0,0) size 785x585
+layer at (0,0) size 785x601
+ RenderBlock {HTML} at (0,0) size 785x601
+ RenderBody {BODY} at (8,8) size 769x585
+ RenderBlock {DIV} at (0,0) size 1274x585
+ RenderBlock {DIV} at (16,16) size 26x553 [border: (1px solid #000000)]
RenderBlock (floating) {DIV} at (1,1) size 24x100
RenderBlock {DIV} at (0,0) size 24x100 [bgcolor=#008000]
- RenderBlock {DIV} at (58,16) size 26x102 [border: (1px solid #000000)]
+ RenderBlock {DIV} at (58,16) size 26x553 [border: (1px solid #000000)]
RenderBlock (floating) {DIV} at (1,1) size 24x96
RenderTable {TABLE} at (0,0) size 24x96 [bgcolor=#FF0000]
RenderTableSection {TBODY} at (0,0) size 24x96
RenderTableRow {TR} at (0,0) size 24x96
RenderTableCell {TD} at (0,1) size 24x94 [r=0 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,-1) size 22x96 [bgcolor=#008000]
- RenderBlock {DIV} at (100,16) size 571x102 [border: (1px solid #000000)]
- RenderBlock {DIV} at (1,1) size 569x100
+ RenderBlock {DIV} at (100,16) size 571x553 [border: (1px solid #000000)]
+ RenderBlock {DIV} at (1,1) size 569x551
RenderBlock {DIV} at (0,0) size 569x100 [bgcolor=#008000]
- RenderBlock {DIV} at (687,16) size 571x102 [border: (1px solid #000000)]
- RenderBlock {DIV} at (1,1) size 569x100
+ RenderBlock {DIV} at (687,16) size 571x553 [border: (1px solid #000000)]
+ RenderBlock {DIV} at (1,1) size 569x551
RenderTable {TABLE} at (0,0) size 569x96 [bgcolor=#FF0000]
RenderTableSection {TBODY} at (0,0) size 569x96
RenderTableRow {TR} at (0,0) size 569x96
Modified: trunk/LayoutTests/platform/mac/fast/writing-mode/fallback-orientation-expected.txt (97661 => 97662)
--- trunk/LayoutTests/platform/mac/fast/writing-mode/fallback-orientation-expected.txt 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/LayoutTests/platform/mac/fast/writing-mode/fallback-orientation-expected.txt 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1,11 +1,11 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
+layer at (0,0) size 785x650
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x650
+ RenderBlock {HTML} at (0,0) size 785x650
+ RenderBody {BODY} at (8,8) size 769x634
+ RenderBlock {P} at (0,0) size 769x18
RenderText {#text} at (0,0) size 211x18
text run at (0,0) width 211: "This should be pointing upwards:"
- RenderBlock {DIV} at (0,34) size 120x81
+ RenderBlock {DIV} at (0,34) size 120x600
RenderText {#text} at (20,0) size 80x81
text run at (20,0) width 81: "\x{3008}"
Modified: trunk/Source/WebCore/ChangeLog (97661 => 97662)
--- trunk/Source/WebCore/ChangeLog 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/Source/WebCore/ChangeLog 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1,5 +1,16 @@
2011-10-17 Ojan Vafai <[email protected]>
+ Unreviewed, rolling out r97654.
+ http://trac.webkit.org/changeset/97654
+ https://bugs.webkit.org/show_bug.cgi?id=68497
+
+ Caused a number of Chromium failures.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::sizesToIntrinsicLogicalWidth):
+
+2011-10-17 Ojan Vafai <[email protected]>
+
Unreviewed, rolling out r97653.
http://trac.webkit.org/changeset/97653
https://bugs.webkit.org/show_bug.cgi?id=69957
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (97661 => 97662)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-10-17 22:53:43 UTC (rev 97661)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-10-17 22:56:31 UTC (rev 97662)
@@ -1816,9 +1816,6 @@
if (logicalWidth.type() == Auto && !(parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOrient() == VERTICAL && parent()->style()->boxAlign() == BSTRETCH) && node() && (node()->hasTagName(inputTag) || node()->hasTagName(selectTag) || node()->hasTagName(buttonTag) || node()->hasTagName(textareaTag) || node()->hasTagName(legendTag)))
return true;
- if (isHorizontalWritingMode() != containingBlock()->isHorizontalWritingMode())
- return true;
-
return false;
}
