Diff
Modified: trunk/LayoutTests/ChangeLog (175391 => 175392)
--- trunk/LayoutTests/ChangeLog 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/ChangeLog 2014-10-30 23:10:55 UTC (rev 175392)
@@ -1,3 +1,23 @@
+2014-10-30 Roger Fong <[email protected]>
+
+ [Windows] Text rebaselining after r175384.
+
+ * platform/win/css1/box_properties/margin_right-expected.txt:
+ * platform/win/css1/box_properties/padding-expected.txt:
+ * platform/win/css1/box_properties/padding_left-expected.txt:
+ * platform/win/css1/box_properties/padding_right-expected.txt:
+ * platform/win/css1/box_properties/padding_top-expected.txt:
+ * platform/win/css1/font_properties/font-expected.txt:
+ * platform/win/css1/formatting_model/vertical_formatting-expected.txt:
+ * platform/win/css1/text_properties/text_transform-expected.txt:
+ * platform/win/fast/css/empty-pseudo-class-expected.txt:
+ * platform/win/fast/css/first-child-pseudo-class-expected.txt:
+ * platform/win/fast/css/only-child-pseudo-class-expected.txt:
+ * platform/win/fast/dom/HTMLProgressElement/progress-element-expected.txt: Added.
+ * platform/win/fast/forms/targeted-frame-submission-expected.txt:
+ * platform/win/fast/table/append-cells2-expected.txt:
+ * platform/win/tables/mozilla/bugs/45621-expected.txt:
+
2014-10-30 Ada Chan <[email protected]>
The Page's muted setting should not affect the HTMLMediaElement's 'muted' IDL attribute.
Modified: trunk/LayoutTests/platform/win/css1/box_properties/margin_right-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/box_properties/margin_right-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/box_properties/margin_right-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,17 +9,11 @@
RenderBlock {PRE} at (0,34) size 769x90
RenderText {#text} at (0,0) size 560x90
text run at (0,0) width 552: ".zero {background-color: silver; margin-right: 0; text-align: right;}"
- text run at (552,0) width 0: " "
text run at (0,15) width 560: ".one {margin-right: 0.5in; text-align: right; background-color: aqua;}"
- text run at (560,15) width 0: " "
text run at (0,30) width 552: ".two {margin-right: 25px; text-align: right; background-color: aqua;}"
- text run at (552,30) width 0: " "
text run at (0,45) width 560: ".three {margin-right: 5em; text-align: right; background-color: aqua;}"
- text run at (560,45) width 0: " "
text run at (0,60) width 552: ".four {margin-right: 25%; text-align: right; background-color: aqua;}"
- text run at (552,60) width 0: " "
text run at (0,75) width 416: ".five {margin-right: -10px; background-color: aqua;}"
- text run at (416,75) width 0: " "
RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0]
RenderText {#text} at (566,0) size 203x18
Modified: trunk/LayoutTests/platform/win/css1/box_properties/padding-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/box_properties/padding-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/box_properties/padding-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,17 +9,11 @@
RenderBlock {PRE} at (0,34) size 769x90
RenderText {#text} at (0,0) size 376x90
text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}"
- text run at (360,0) width 0: " "
text run at (0,15) width 368: ".one {padding: 0.5in; background-color: aqua;}"
- text run at (368,15) width 0: " "
text run at (0,30) width 360: ".two {padding: 25px; background-color: aqua;}"
- text run at (360,30) width 0: " "
text run at (0,45) width 368: ".three {padding: 5em; background-color: aqua;}"
- text run at (368,45) width 0: " "
text run at (0,60) width 360: ".four {padding: 25%; background-color: aqua;}"
- text run at (360,60) width 0: " "
text run at (0,75) width 376: ".five {padding: -20px; background-color: aqua;}"
- text run at (376,75) width 0: " "
RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0]
RenderText {#text} at (0,0) size 203x18
Modified: trunk/LayoutTests/platform/win/css1/box_properties/padding_left-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/box_properties/padding_left-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/box_properties/padding_left-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,17 +9,11 @@
RenderBlock {PRE} at (0,34) size 769x90
RenderText {#text} at (0,0) size 416x90
text run at (0,0) width 400: ".zero {background-color: silver; padding-left: 0;}"
- text run at (400,0) width 0: " "
text run at (0,15) width 408: ".one {padding-left: 0.5in; background-color: aqua;}"
- text run at (408,15) width 0: " "
text run at (0,30) width 400: ".two {padding-left: 25px; background-color: aqua;}"
- text run at (400,30) width 0: " "
text run at (0,45) width 408: ".three {padding-left: 5em; background-color: aqua;}"
- text run at (408,45) width 0: " "
text run at (0,60) width 400: ".four {padding-left: 25%; background-color: aqua;}"
- text run at (400,60) width 0: " "
text run at (0,75) width 416: ".five {padding-left: -20px; background-color: aqua;}"
- text run at (416,75) width 0: " "
RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0]
RenderText {#text} at (0,0) size 203x18
Modified: trunk/LayoutTests/platform/win/css1/box_properties/padding_right-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/box_properties/padding_right-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/box_properties/padding_right-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,17 +9,10 @@
RenderBlock {PRE} at (0,34) size 769x90
RenderText {#text} at (0,0) size 576x90
text run at (0,0) width 408: ".zero {background-color: silver; padding-right: 0;}"
- text run at (408,0) width 0: " "
- text run at (0,15) width 568: ".one {padding-right: 0.5in; text-align: right; background-color: aqua;}"
- text run at (568,15) width 0: " "
text run at (0,30) width 560: ".two {padding-right: 25px; text-align: right; background-color: aqua;}"
- text run at (560,30) width 0: " "
text run at (0,45) width 568: ".three {padding-right: 5em; text-align: right; background-color: aqua;}"
- text run at (568,45) width 0: " "
text run at (0,60) width 560: ".four {padding-right: 25%; text-align: right; background-color: aqua;}"
- text run at (560,60) width 0: " "
text run at (0,75) width 576: ".five {padding-right: -20px; text-align: right; background-color: aqua;}"
- text run at (576,75) width 0: " "
RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0]
RenderText {#text} at (0,0) size 203x18
Modified: trunk/LayoutTests/platform/win/css1/box_properties/padding_top-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/box_properties/padding_top-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/box_properties/padding_top-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,17 +9,11 @@
RenderBlock {PRE} at (0,34) size 769x90
RenderText {#text} at (0,0) size 408x90
text run at (0,0) width 392: ".zero {background-color: silver; padding-top: 0;}"
- text run at (392,0) width 0: " "
text run at (0,15) width 400: ".one {padding-top: 0.5in; background-color: aqua;}"
- text run at (400,15) width 0: " "
text run at (0,30) width 392: ".two {padding-top: 25px; background-color: aqua;}"
- text run at (392,30) width 0: " "
text run at (0,45) width 400: ".three {padding-top: 5em; background-color: aqua;}"
- text run at (400,45) width 0: " "
text run at (0,60) width 392: ".four {padding-top: 25%; background-color: aqua;}"
- text run at (392,60) width 0: " "
text run at (0,75) width 408: ".five {padding-top: -20px; background-color: aqua;}"
- text run at (408,75) width 0: " "
RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0]
RenderText {#text} at (0,0) size 203x18
Modified: trunk/LayoutTests/platform/win/css1/font_properties/font-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/font_properties/font-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/font_properties/font-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,29 +9,17 @@
RenderBlock {PRE} at (0,26) size 769x168
RenderText {#text} at (0,0) size 399x168
text run at (0,0) width 161: "BODY {font-size: 12px;}"
- text run at (161,0) width 0: " "
text run at (0,14) width 322: ".one {font: italic small-caps 13pt Helvetica;}"
- text run at (322,14) width 0: " "
text run at (0,28) width 203: ".two {font: 150%/150% serif;}"
- text run at (203,28) width 0: " "
text run at (0,42) width 252: ".three {font: 150%/150% sans-serif;}"
- text run at (252,42) width 0: " "
text run at (0,56) width 231: ".four {font: small/200% cursive;}"
- text run at (231,56) width 0: " "
text run at (0,70) width 399: ".five {font: italic small-caps 900 150%/150% sans-serif;}"
- text run at (399,70) width 0: " "
text run at (0,84) width 392: ".six {font: italic small-caps 100 150%/300% sans-serif;}"
- text run at (392,84) width 0: " "
text run at (0,98) width 392: ".seven {font: italic small-caps 900 150%/2em monospace;}"
- text run at (392,98) width 0: " "
text run at (0,112) width 399: ".eight {font: italic small-caps 500 150%/1in sans-serif;}"
- text run at (399,112) width 0: " "
text run at (0,126) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}"
- text run at (378,126) width 0: " "
text run at (0,140) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}"
- text run at (301,140) width 0: " "
text run at (0,154) width 266: "SPAN.color {background-color: silver;}"
- text run at (266,154) width 0: " "
RenderBlock {HR} at (0,206) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,220) size 769x14
RenderText {#text} at (0,0) size 706x14
Modified: trunk/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,43 +9,24 @@
RenderBlock {PRE} at (0,34) size 769x300
RenderText {#text} at (0,0) size 496x300
text run at (0,0) width 368: "P.one {margin-bottom: 2cm; padding-bottom: 0;}"
- text run at (368,0) width 0: " "
text run at (0,15) width 320: "P.two {margin-top: 2cm; padding-top: 0;}"
- text run at (320,15) width 0: " "
text run at (0,30) width 320: "P.three {margin-top: 0; padding-top: 0;}"
- text run at (320,30) width 0: " "
text run at (0,45) width 344: "P.four {margin-top: -1cm; margin-bottom: 0;"
- text run at (344,45) width 0: " "
text run at (0,60) width 344: " padding-top: 0; padding-bottom: 0;}"
- text run at (344,60) width 0: " "
text run at (0,75) width 368: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;"
- text run at (368,75) width 0: " "
text run at (0,90) width 376: " padding-top: 1cm; padding-bottom: 0;}"
- text run at (376,90) width 0: " "
text run at (0,105) width 344: "P.six {margin-top: 1cm; margin-bottom: 1cm;"
- text run at (344,105) width 0: " "
text run at (0,120) width 336: " padding-top: 0; padding-bottom: 0;}"
- text run at (336,120) width 0: " "
text run at (0,135) width 336: "P.seven {margin-top: 1cm; padding-top: 0;}"
- text run at (336,135) width 0: " "
text run at (0,150) width 408: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}"
- text run at (408,150) width 0: " "
text run at (0,165) width 344: "P.nine {margin-top: -1cm; padding-top: 1cm;"
- text run at (344,165) width 0: " "
text run at (0,180) width 376: " padding-bottom: 0; margin-bottom: 1cm;}"
- text run at (376,180) width 0: " "
text run at (0,195) width 304: "P.ten {margin-top: 1cm;padding-top: 0;"
- text run at (304,195) width 0: " "
text run at (0,210) width 248: " float: left;width: 50%;}"
- text run at (248,210) width 0: " "
text run at (0,225) width 448: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}"
- text run at (448,225) width 0: " "
text run at (0,240) width 496: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}"
- text run at (496,240) width 0: " "
text run at (0,255) width 360: "P.thirteen {margin-top: 0; padding-top: 1cm;}"
- text run at (360,255) width 0: " "
text run at (0,270) width 160: "TABLE {clear: both;}"
- text run at (160,270) width 0: " "
text run at (0,285) width 0: " "
RenderBlock {HR} at (0,347) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,365) size 769x36
Modified: trunk/LayoutTests/platform/win/css1/text_properties/text_transform-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/css1/text_properties/text_transform-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/css1/text_properties/text_transform-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -9,13 +9,9 @@
RenderBlock {PRE} at (0,34) size 769x75
RenderText {#text} at (0,0) size 272x75
text run at (0,0) width 224: ".ttn {text-transform: none;}"
- text run at (224,0) width 0: " "
text run at (0,15) width 272: ".cap {text-transform: capitalize;}"
- text run at (272,15) width 0: " "
text run at (0,30) width 264: ".upp {text-transform: uppercase;}"
- text run at (264,30) width 0: " "
text run at (0,45) width 264: ".low {text-transform: lowercase;}"
- text run at (264,45) width 0: " "
text run at (0,60) width 0: " "
RenderBlock {HR} at (0,122) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,140) size 769x36
Modified: trunk/LayoutTests/platform/win/fast/css/empty-pseudo-class-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/fast/css/empty-pseudo-class-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/fast/css/empty-pseudo-class-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -77,14 +77,10 @@
RenderBlock {PRE} at (16,71) size 584x103 [bgcolor=#FFFFFF]
RenderText {#text} at (6,7) size 225x90
text run at (6,7) width 65: ":empty {"
- text run at (70,7) width 1: " "
text run at (6,22) width 9: "}"
- text run at (14,22) width 1: " "
text run at (6,37) width 1: " "
text run at (6,52) width 49: "<div> "
- text run at (54,52) width 1: " "
text run at (6,67) width 225: " How about regular text..."
- text run at (230,67) width 1: " "
text run at (6,82) width 49: "</div>"
RenderBlock {P} at (16,190) size 584x18
RenderText {#text} at (0,0) size 533x17
Modified: trunk/LayoutTests/platform/win/fast/css/first-child-pseudo-class-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/fast/css/first-child-pseudo-class-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/fast/css/first-child-pseudo-class-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -100,16 +100,11 @@
RenderBlock {PRE} at (16,71) size 584x118 [bgcolor=#FFFFFF]
RenderText {#text} at (6,7) size 225x105
text run at (6,7) width 145: "div :first-child {"
- text run at (150,7) width 1: " "
text run at (6,22) width 9: "}"
- text run at (14,22) width 1: " "
text run at (6,37) width 1: " "
text run at (6,52) width 49: "<div> "
- text run at (54,52) width 1: " "
text run at (6,67) width 225: " How about regular text..."
- text run at (230,67) width 1: " "
text run at (6,82) width 113: " <div></div>"
- text run at (118,82) width 1: " "
text run at (6,97) width 49: "</div>"
RenderBlock {P} at (16,205) size 584x54
RenderText {#text} at (0,0) size 567x53
Modified: trunk/LayoutTests/platform/win/fast/css/only-child-pseudo-class-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/fast/css/only-child-pseudo-class-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/fast/css/only-child-pseudo-class-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -98,16 +98,11 @@
RenderListMarker at (-37,6) size 17x18: "4"
RenderText {#text} at (6,8) size 225x107
text run at (6,8) width 137: "div :only-child {"
- text run at (142,8) width 1: " "
text run at (6,25) width 9: "}"
- text run at (14,25) width 1: " "
text run at (6,40) width 1: " "
text run at (6,55) width 49: "<div> "
- text run at (54,55) width 1: " "
text run at (6,70) width 113: " <div></div>"
- text run at (118,70) width 1: " "
text run at (6,85) width 225: " <blockquote></blockquote>"
- text run at (230,85) width 1: " "
text run at (6,100) width 49: "</div>"
RenderBlock {P} at (16,193) size 584x36
RenderText {#text} at (0,0) size 570x35
Added: trunk/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-element-expected.txt (0 => 175392)
--- trunk/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-element-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-element-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -0,0 +1,9 @@
+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
+ RenderProgress {PROGRESS} at (0,-1) size 160x17
+ RenderInline {SMALL} at (0,0) size 134x15
+ RenderProgress {PROGRESS} at (160,1) size 134x14
+ RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/win/fast/forms/targeted-frame-submission-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/fast/forms/targeted-frame-submission-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/fast/forms/targeted-frame-submission-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -24,5 +24,4 @@
RenderBlock {PRE} at (0,0) size 284x15
RenderText {#text} at (0,0) size 56x15
text run at (0,0) width 56: "SUCCESS"
- text run at (56,0) width 0: " "
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/win/fast/table/append-cells2-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/fast/table/append-cells2-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/fast/table/append-cells2-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -75,15 +75,15 @@
RenderTableCell {TD} at (0,36) size 90x18 [r=2 c=0 rs=1 cs=1]
RenderText {#text} at (0,0) size 4x18
text run at (0,0) width 4: " "
- RenderBlock (anonymous) at (0,124) size 784x22
- RenderButton {BUTTON} at (2,2) size 44x18 [bgcolor=#C0C0C0] [border: none (2px outset #C0C0C0) none (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,2) size 28x13
- RenderText {#text} at (0,0) size 28x13
- text run at (0,0) width 28: "show"
- RenderText {#text} at (47,1) size 5x18
- text run at (47,1) width 5: " "
- RenderButton {BUTTON} at (53,2) size 40x18 [bgcolor=#C0C0C0] [border: none (2px outset #C0C0C0) none (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,2) size 24x13
- RenderText {#text} at (0,0) size 24x13
+ RenderBlock (anonymous) at (0,124) size 784x25
+ RenderButton {BUTTON} at (2,2) size 46x21 [bgcolor=#F0F0F0] [border: (2px outset #F0F0F0)]
+ RenderBlock (anonymous) at (8,3) size 30x15
+ RenderText {#text} at (0,0) size 30x15
+ text run at (0,0) width 30: "show"
+ RenderText {#text} at (50,3) size 4x18
+ text run at (50,3) width 4: " "
+ RenderButton {BUTTON} at (56,2) size 40x21 [bgcolor=#F0F0F0] [border: (2px outset #F0F0F0)]
+ RenderBlock (anonymous) at (8,3) size 24x15
+ RenderText {#text} at (0,0) size 24x15
text run at (0,0) width 24: "hide"
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/win/tables/mozilla/bugs/45621-expected.txt (175391 => 175392)
--- trunk/LayoutTests/platform/win/tables/mozilla/bugs/45621-expected.txt 2014-10-30 23:08:20 UTC (rev 175391)
+++ trunk/LayoutTests/platform/win/tables/mozilla/bugs/45621-expected.txt 2014-10-30 23:10:55 UTC (rev 175392)
@@ -6,11 +6,8 @@
RenderBlock {PRE} at (0,0) size 784x45
RenderText {#text} at (0,0) size 168x45
text run at (0,0) width 120: "table width=50%"
- text run at (120,0) width 0: " "
text run at (0,15) width 96: " td nowrap "
- text run at (96,15) width 0: " "
text run at (0,30) width 168: " input width=100% "
- text run at (168,30) width 0: " "
RenderTable {TABLE} at (0,58) size 392x49 [bgcolor=#C0C0C0] [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 390x47
RenderTableRow {TR} at (0,2) size 390x43
