Diff
Modified: trunk/LayoutTests/ChangeLog (168076 => 168077)
--- trunk/LayoutTests/ChangeLog 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/ChangeLog 2014-05-01 02:15:15 UTC (rev 168077)
@@ -1,3 +1,20 @@
+2014-04-30 Simon Fraser <simon.fra...@apple.com>
+
+ Rebaseline compositing/overflow tests for iOS.
+
+ * platform/ios-sim/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt:
+ * platform/ios-sim/compositing/overflow/composited-scrolling-paint-phases-expected.txt:
+ * platform/ios-sim/compositing/overflow/content-gains-scrollbars-expected.txt:
+ * platform/ios-sim/compositing/overflow/fixed-position-ancestor-clip-expected.txt:
+ * platform/ios-sim/compositing/overflow/overflow-scroll-expected.txt:
+ * platform/ios-sim/compositing/overflow/overflow-scrollbar-layers-expected.txt:
+ * platform/ios-sim/compositing/overflow/remove-overflow-crash2-expected.txt:
+ * platform/ios-sim/compositing/overflow/scrollbar-painting-expected.txt:
+ * platform/ios-sim/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt:
+ * platform/ios-sim/compositing/overflow/scrolling-without-painting-expected.txt:
+ * platform/ios-sim/compositing/overflow/textarea-scroll-touch-expected.txt:
+ * platform/ios-sim/compositing/overflow/updating-scrolling-content-expected.txt:
+
2014-04-30 David Hyatt <hy...@apple.com>
REGRESSION (r168046): [New Multicolumn] Painting order is wrong for columns and fixed positioned elements
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -8,13 +8,13 @@
(position 28.00 20.00)
(bounds 202.00 202.00)
(drawsContent 1)
- (children 4
+ (children 3
(GraphicsLayer
(position 1.00 1.00)
- (bounds 185.00 185.00)
+ (bounds 200.00 200.00)
(children 2
(GraphicsLayer
- (bounds 185.00 185.00)
+ (bounds 200.00 200.00)
(drawsContent 1)
)
(GraphicsLayer
@@ -24,20 +24,15 @@
)
)
(GraphicsLayer
- (position 1.00 186.00)
- (bounds 185.00 15.00)
+ (position 1.00 201.00)
+ (bounds 200.00 0.00)
(drawsContent 1)
)
(GraphicsLayer
- (position 186.00 1.00)
- (bounds 15.00 185.00)
+ (position 201.00 1.00)
+ (bounds 0.00 200.00)
(drawsContent 1)
)
- (GraphicsLayer
- (position 186.00 186.00)
- (bounds 15.00 15.00)
- (drawsContent 1)
- )
)
)
)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/composited-scrolling-paint-phases-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/composited-scrolling-paint-phases-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/composited-scrolling-paint-phases-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -22,10 +22,10 @@
GraphicsLayerPaintBackground
GraphicsLayerPaintMask
)
- (children 4
+ (children 3
(GraphicsLayer
(position 1.00 1.00)
- (bounds 185.00 185.00)
+ (bounds 200.00 200.00)
(paintingPhases
GraphicsLayerPaintBackground
GraphicsLayerPaintForeground
@@ -43,7 +43,7 @@
)
)
(GraphicsLayer
- (bounds 185.00 185.00)
+ (bounds 200.00 200.00)
(drawsContent 1)
(paintingPhases
GraphicsLayerPaintForeground
@@ -52,8 +52,8 @@
)
)
(GraphicsLayer
- (position 1.00 186.00)
- (bounds 185.00 15.00)
+ (position 1.00 201.00)
+ (bounds 200.00 0.00)
(drawsContent 1)
(paintingPhases
GraphicsLayerPaintBackground
@@ -62,8 +62,8 @@
)
)
(GraphicsLayer
- (position 186.00 1.00)
- (bounds 15.00 185.00)
+ (position 201.00 1.00)
+ (bounds 0.00 200.00)
(drawsContent 1)
(paintingPhases
GraphicsLayerPaintBackground
@@ -71,16 +71,6 @@
GraphicsLayerPaintMask
)
)
- (GraphicsLayer
- (position 186.00 186.00)
- (bounds 15.00 15.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- GraphicsLayerPaintMask
- )
- )
)
)
)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/content-gains-scrollbars-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/content-gains-scrollbars-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/content-gains-scrollbars-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -9,7 +9,7 @@
(bounds 100.00 100.00)
(children 1
(GraphicsLayer
- (bounds 85.00 100.00)
+ (bounds 100.00 100.00)
(children 1
(GraphicsLayer
(bounds 10.00 200.00)
@@ -23,7 +23,7 @@
(bounds 100.00 100.00)
(children 1
(GraphicsLayer
- (bounds 100.00 85.00)
+ (bounds 100.00 100.00)
(children 1
(GraphicsLayer
(bounds 200.00 10.00)
@@ -37,7 +37,7 @@
(bounds 100.00 100.00)
(children 1
(GraphicsLayer
- (bounds 85.00 85.00)
+ (bounds 100.00 100.00)
(children 1
(GraphicsLayer
(bounds 200.00 200.00)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/fixed-position-ancestor-clip-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/fixed-position-ancestor-clip-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/fixed-position-ancestor-clip-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -11,4 +11,3 @@
RenderBlock (positioned) {DIV} at (8,8) size 100x100 [bgcolor=#FF0000]
layer at (8,8) size 100x100
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-scrolled to 50,50
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/overflow-scroll-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/overflow-scroll-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/overflow-scroll-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -32,95 +32,95 @@
RenderText {#text} at (524,511) size 4x19
text run at (524,511) width 4: " "
RenderText {#text} at (0,0) size 0x0
-layer at (18,62) size 152x152 clip at (19,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (18,62) size 152x152 clip at (19,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (10,10) size 152x152 [border: (1px solid #000000)]
-layer at (194,62) size 152x152 clip at (195,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (194,62) size 152x152 clip at (195,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (186,10) size 152x152 [border: (1px solid #000000)]
-layer at (19,13) size 210x510 backgroundClip at (19,63) size 135x135 clip at (19,63) size 135x135 outlineClip at (19,63) size 135x135
+layer at (19,13) size 210x510 backgroundClip at (19,63) size 150x150 clip at (19,63) size 150x150 outlineClip at (19,63) size 150x150
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (195,13) size 210x510 backgroundClip at (195,63) size 135x135 clip at (195,63) size 135x135 outlineClip at (195,63) size 135x135
+layer at (195,13) size 210x510 backgroundClip at (195,63) size 150x150 clip at (195,63) size 150x150 outlineClip at (195,63) size 150x150
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (370,62) size 152x152 clip at (371,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (370,62) size 152x152 clip at (371,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (362,10) size 152x152 [border: (1px solid #000000)]
-layer at (371,13) size 210x510 backgroundClip at (371,63) size 135x135 clip at (371,63) size 135x135 outlineClip at (371,63) size 135x135
+layer at (371,13) size 210x510 backgroundClip at (371,63) size 150x150 clip at (371,63) size 150x150 outlineClip at (371,63) size 150x150
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (546,62) size 152x152 clip at (547,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (546,62) size 152x152 clip at (547,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (538,10) size 152x152 [border: (1px solid #000000)]
-layer at (547,13) size 210x510 backgroundClip at (547,63) size 135x135 clip at (547,63) size 135x135 outlineClip at (547,63) size 135x135
+layer at (547,13) size 210x510 backgroundClip at (547,63) size 150x150 clip at (547,63) size 150x150 outlineClip at (547,63) size 150x150
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (18,239) size 152x152 clip at (19,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (18,239) size 152x152 clip at (19,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (10,187) size 152x152 [border: (1px solid #000000)]
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (194,239) size 152x152 clip at (195,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (194,239) size 152x152 clip at (195,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (186,187) size 152x152 [border: (1px solid #000000)]
-layer at (195,190) size 210x510 backgroundClip at (195,240) size 135x135 clip at (195,240) size 135x135 outlineClip at (195,240) size 135x135
+layer at (195,190) size 210x510 backgroundClip at (195,240) size 150x150 clip at (195,240) size 150x150 outlineClip at (195,240) size 150x150
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (370,239) size 152x152 clip at (371,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (370,239) size 152x152 clip at (371,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (362,187) size 152x152 [border: (1px solid #000000)]
-layer at (371,190) size 210x510 backgroundClip at (371,240) size 135x135 clip at (371,240) size 135x135 outlineClip at (371,240) size 135x135
+layer at (371,190) size 210x510 backgroundClip at (371,240) size 150x150 clip at (371,240) size 150x150 outlineClip at (371,240) size 150x150
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (546,239) size 152x152 clip at (547,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (546,239) size 152x152 clip at (547,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (538,187) size 152x152 [border: (1px solid #000000)]
-layer at (547,190) size 210x510 backgroundClip at (547,240) size 135x135 clip at (547,240) size 135x135 outlineClip at (547,240) size 135x135
+layer at (547,190) size 210x510 backgroundClip at (547,240) size 150x150 clip at (547,240) size 150x150 outlineClip at (547,240) size 150x150
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (18,416) size 152x152 clip at (19,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (18,416) size 152x152 clip at (19,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (10,364) size 152x152 [border: (1px solid #000000)]
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (194,416) size 152x152 clip at (195,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (194,416) size 152x152 clip at (195,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (186,364) size 152x152 [border: (1px solid #000000)]
-layer at (195,367) size 210x510 backgroundClip at (195,417) size 135x135 clip at (195,417) size 135x135 outlineClip at (195,417) size 135x135
+layer at (195,367) size 210x510 backgroundClip at (195,417) size 150x150 clip at (195,417) size 150x150 outlineClip at (195,417) size 150x150
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (370,416) size 152x152 clip at (371,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (370,416) size 152x152 clip at (371,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (362,364) size 152x152 [border: (1px solid #000000)]
-layer at (371,367) size 210x510 backgroundClip at (371,417) size 135x135 clip at (371,417) size 135x135 outlineClip at (371,417) size 135x135
+layer at (371,367) size 210x510 backgroundClip at (371,417) size 150x150 clip at (371,417) size 150x150 outlineClip at (371,417) size 150x150
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (546,416) size 152x152 clip at (547,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (546,416) size 152x152 clip at (547,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (538,364) size 152x152 [border: (1px solid #000000)]
-layer at (547,367) size 210x510 backgroundClip at (547,417) size 135x135 clip at (547,417) size 135x135 outlineClip at (547,417) size 135x135
+layer at (547,367) size 210x510 backgroundClip at (547,417) size 150x150 clip at (547,417) size 150x150 outlineClip at (547,417) size 150x150
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/overflow-scrollbar-layers-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/overflow-scrollbar-layers-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/overflow-scrollbar-layers-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -9,7 +9,7 @@
(bounds 100.00 100.00)
(children 1
(GraphicsLayer
- (bounds 85.00 100.00)
+ (bounds 100.00 100.00)
(children 1
(GraphicsLayer
(bounds 10.00 200.00)
@@ -23,7 +23,7 @@
(bounds 100.00 100.00)
(children 1
(GraphicsLayer
- (bounds 100.00 85.00)
+ (bounds 100.00 100.00)
(children 1
(GraphicsLayer
(bounds 200.00 10.00)
@@ -37,7 +37,7 @@
(bounds 100.00 100.00)
(children 1
(GraphicsLayer
- (bounds 85.00 85.00)
+ (bounds 100.00 100.00)
(children 1
(GraphicsLayer
(bounds 200.00 200.00)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/remove-overflow-crash2-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/remove-overflow-crash2-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/remove-overflow-crash2-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -3,90 +3,74 @@
layer at (0,0) size 800x218
RenderBlock {HTML} at (0,0) size 800x218
RenderBody {BODY} at (8,8) size 784x202
-layer at (8,8) size 103x202 clip at (9,9) size 86x185 scrollHeight 1680
+layer at (8,8) size 103x202 clip at (9,9) size 101x200 scrollHeight 1360
RenderBlock {DIV} at (0,0) size 103x202 [border: (1px solid #000000)]
- RenderText {#text} at (1,1) size 86x1679
+ RenderText {#text} at (1,1) size 101x1359
text run at (1,1) width 86: "Lorem ipsum"
- text run at (1,21) width 53: "dolor sit"
- text run at (1,41) width 36: "amet,"
- text run at (1,61) width 73: "consectetur"
- text run at (1,81) width 71: "adipisicing"
- text run at (1,101) width 70: "elit, sed do"
- text run at (1,121) width 55: "eiusmod"
- text run at (1,141) width 46: "tempor"
- text run at (1,161) width 82: "incididunt ut"
- text run at (1,181) width 56: "labore et"
- text run at (1,201) width 41: "dolore"
- text run at (1,221) width 43: "magna"
- text run at (1,241) width 64: "aliqua. Ut"
- text run at (1,261) width 52: "enim ad"
- text run at (1,281) width 42: "minim"
- text run at (1,301) width 82: "veniam, quis"
- text run at (1,321) width 48: "nostrud"
- text run at (1,341) width 76: "exercitation"
- text run at (1,361) width 52: "ullamco"
- text run at (1,381) width 71: "laboris nisi"
- text run at (1,401) width 80: "ut aliquip ex"
- text run at (1,421) width 83: "ea commodo"
- text run at (1,441) width 68: "consequat."
- text run at (1,461) width 61: "Duis aute"
- text run at (1,481) width 85: "irure dolor in"
- text run at (1,501) width 86: "reprehenderit"
- text run at (1,521) width 76: "in voluptate"
- text run at (1,541) width 60: "velit esse"
- text run at (1,561) width 86: "cillum dolore"
- text run at (1,581) width 57: "eu fugiat"
- text run at (1,601) width 32: "nulla"
- text run at (1,621) width 54: "pariatur."
- text run at (1,641) width 65: "Excepteur"
- text run at (1,661) width 83: "sint occaecat"
- text run at (1,681) width 59: "cupidatat"
- text run at (1,701) width 86: "non proident,"
- text run at (1,721) width 82: "sunt in culpa"
- text run at (1,741) width 67: "qui officia"
- text run at (1,761) width 55: "deserunt"
- text run at (1,781) width 75: "mollit anim"
- text run at (1,801) width 35: "id est"
- text run at (1,821) width 58: "laborum."
- text run at (1,841) width 86: "Lorem ipsum"
- text run at (1,861) width 53: "dolor sit"
- text run at (1,881) width 36: "amet,"
- text run at (1,901) width 73: "consectetur"
- text run at (1,921) width 71: "adipisicing"
- text run at (1,941) width 70: "elit, sed do"
- text run at (1,961) width 55: "eiusmod"
- text run at (1,981) width 46: "tempor"
- text run at (1,1001) width 82: "incididunt ut"
- text run at (1,1021) width 56: "labore et"
- text run at (1,1041) width 41: "dolore"
- text run at (1,1061) width 43: "magna"
- text run at (1,1081) width 64: "aliqua. Ut"
- text run at (1,1101) width 52: "enim ad"
- text run at (1,1121) width 42: "minim"
- text run at (1,1141) width 82: "veniam, quis"
- text run at (1,1161) width 48: "nostrud"
- text run at (1,1181) width 76: "exercitation"
- text run at (1,1201) width 52: "ullamco"
- text run at (1,1221) width 71: "laboris nisi"
- text run at (1,1241) width 80: "ut aliquip ex"
- text run at (1,1261) width 83: "ea commodo"
- text run at (1,1281) width 68: "consequat."
- text run at (1,1301) width 61: "Duis aute"
- text run at (1,1321) width 85: "irure dolor in"
- text run at (1,1341) width 86: "reprehenderit"
- text run at (1,1361) width 76: "in voluptate"
- text run at (1,1381) width 60: "velit esse"
- text run at (1,1401) width 86: "cillum dolore"
- text run at (1,1421) width 57: "eu fugiat"
- text run at (1,1441) width 32: "nulla"
- text run at (1,1461) width 54: "pariatur."
- text run at (1,1481) width 65: "Excepteur"
- text run at (1,1501) width 83: "sint occaecat"
- text run at (1,1521) width 59: "cupidatat"
- text run at (1,1541) width 86: "non proident,"
- text run at (1,1561) width 82: "sunt in culpa"
- text run at (1,1581) width 67: "qui officia"
- text run at (1,1601) width 55: "deserunt"
- text run at (1,1621) width 75: "mollit anim"
- text run at (1,1641) width 35: "id est"
- text run at (1,1661) width 58: "laborum."
+ text run at (1,21) width 92: "dolor sit amet,"
+ text run at (1,41) width 73: "consectetur"
+ text run at (1,61) width 99: "adipisicing elit,"
+ text run at (1,81) width 100: "sed do eiusmod"
+ text run at (1,101) width 46: "tempor"
+ text run at (1,121) width 82: "incididunt ut"
+ text run at (1,141) width 101: "labore et dolore"
+ text run at (1,161) width 90: "magna aliqua."
+ text run at (1,181) width 72: "Ut enim ad"
+ text run at (1,201) width 97: "minim veniam,"
+ text run at (1,221) width 79: "quis nostrud"
+ text run at (1,241) width 76: "exercitation"
+ text run at (1,261) width 100: "ullamco laboris"
+ text run at (1,281) width 88: "nisi ut aliquip"
+ text run at (1,301) width 34: "ex ea"
+ text run at (1,321) width 64: "commodo"
+ text run at (1,341) width 68: "consequat."
+ text run at (1,361) width 96: "Duis aute irure"
+ text run at (1,381) width 51: "dolor in"
+ text run at (1,401) width 86: "reprehenderit"
+ text run at (1,421) width 76: "in voluptate"
+ text run at (1,441) width 60: "velit esse"
+ text run at (1,461) width 86: "cillum dolore"
+ text run at (1,481) width 93: "eu fugiat nulla"
+ text run at (1,501) width 54: "pariatur."
+ text run at (1,521) width 92: "Excepteur sint"
+ text run at (1,541) width 56: "occaecat"
+ text run at (1,561) width 87: "cupidatat non"
+ text run at (1,581) width 88: "proident, sunt"
+ text run at (1,601) width 76: "in culpa qui"
+ text run at (1,621) width 100: "officia deserunt"
+ text run at (1,641) width 91: "mollit anim id"
+ text run at (1,661) width 80: "est laborum."
+ text run at (1,681) width 86: "Lorem ipsum"
+ text run at (1,701) width 92: "dolor sit amet,"
+ text run at (1,721) width 73: "consectetur"
+ text run at (1,741) width 99: "adipisicing elit,"
+ text run at (1,761) width 100: "sed do eiusmod"
+ text run at (1,781) width 46: "tempor"
+ text run at (1,801) width 82: "incididunt ut"
+ text run at (1,821) width 101: "labore et dolore"
+ text run at (1,841) width 90: "magna aliqua."
+ text run at (1,861) width 72: "Ut enim ad"
+ text run at (1,881) width 97: "minim veniam,"
+ text run at (1,901) width 79: "quis nostrud"
+ text run at (1,921) width 76: "exercitation"
+ text run at (1,941) width 100: "ullamco laboris"
+ text run at (1,961) width 88: "nisi ut aliquip"
+ text run at (1,981) width 34: "ex ea"
+ text run at (1,1001) width 64: "commodo"
+ text run at (1,1021) width 68: "consequat."
+ text run at (1,1041) width 96: "Duis aute irure"
+ text run at (1,1061) width 51: "dolor in"
+ text run at (1,1081) width 86: "reprehenderit"
+ text run at (1,1101) width 76: "in voluptate"
+ text run at (1,1121) width 60: "velit esse"
+ text run at (1,1141) width 86: "cillum dolore"
+ text run at (1,1161) width 93: "eu fugiat nulla"
+ text run at (1,1181) width 54: "pariatur."
+ text run at (1,1201) width 92: "Excepteur sint"
+ text run at (1,1221) width 56: "occaecat"
+ text run at (1,1241) width 87: "cupidatat non"
+ text run at (1,1261) width 88: "proident, sunt"
+ text run at (1,1281) width 76: "in culpa qui"
+ text run at (1,1301) width 100: "officia deserunt"
+ text run at (1,1321) width 91: "mollit anim id"
+ text run at (1,1341) width 80: "est laborum."
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrollbar-painting-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrollbar-painting-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrollbar-painting-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -6,9 +6,9 @@
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 485x19
text run at (0,0) width 485: "You should see scrollbars on the gray square, and a resizer control below it."
-layer at (18,52) size 100x100 clip at (18,52) size 85x85 scrollWidth 500 scrollHeight 500
+layer at (18,52) size 100x100 scrollWidth 500 scrollHeight 500
RenderBlock (relative positioned) {DIV} at (10,36) size 100x100
-layer at (18,52) size 500x500 backgroundClip at (18,52) size 85x85 clip at (18,52) size 85x85 outlineClip at (18,52) size 85x85
+layer at (18,52) size 500x500 backgroundClip at (18,52) size 100x100 clip at (18,52) size 100x100 outlineClip at (18,52) size 100x100
RenderBlock {DIV} at (0,0) size 500x500 [bgcolor=#808080]
layer at (18,162) size 100x100
RenderBlock {DIV} at (10,146) size 100x100
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -6,7 +6,7 @@
(children 1
(GraphicsLayer
(bounds 320.00 340.00)
- (children 4
+ (children 3
(GraphicsLayer
(bounds 320.00 340.00)
(children 1
@@ -18,20 +18,15 @@
)
)
(GraphicsLayer
- (position 0.00 325.00)
- (bounds 305.00 15.00)
+ (position 0.00 340.00)
+ (bounds 320.00 0.00)
(drawsContent 1)
)
(GraphicsLayer
- (position 305.00 0.00)
- (bounds 15.00 325.00)
+ (position 320.00 0.00)
+ (bounds 0.00 340.00)
(drawsContent 1)
)
- (GraphicsLayer
- (position 305.00 325.00)
- (bounds 15.00 15.00)
- (drawsContent 1)
- )
)
)
)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrolling-without-painting-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrolling-without-painting-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/scrolling-without-painting-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -8,7 +8,7 @@
(position 8.00 8.00)
(bounds 202.00 202.00)
(drawsContent 1)
- (children 4
+ (children 3
(GraphicsLayer
(position 1.00 1.00)
(bounds origin 0.00 25.00)
@@ -21,23 +21,15 @@
)
)
(GraphicsLayer
- (position 1.00 186.00)
- (bounds 185.00 15.00)
+ (position 1.00 201.00)
+ (bounds 200.00 0.00)
(drawsContent 1)
)
(GraphicsLayer
- (position 186.00 1.00)
- (bounds 15.00 185.00)
+ (position 201.00 1.00)
+ (bounds 0.00 200.00)
(drawsContent 1)
- (repaint rects
- (rect 0.00 0.00 15.00 185.00)
- )
)
- (GraphicsLayer
- (position 186.00 186.00)
- (bounds 15.00 15.00)
- (drawsContent 1)
- )
)
)
)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/textarea-scroll-touch-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/textarea-scroll-touch-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/textarea-scroll-touch-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -22,8 +22,8 @@
)
)
(GraphicsLayer
- (position 190.00 1.00)
- (bounds 15.00 124.00)
+ (position 205.00 1.00)
+ (bounds 0.00 124.00)
(drawsContent 1)
)
)
@@ -46,8 +46,8 @@
)
)
(GraphicsLayer
- (position 190.00 1.00)
- (bounds 15.00 124.00)
+ (position 205.00 1.00)
+ (bounds 0.00 124.00)
(drawsContent 1)
)
)
Modified: trunk/LayoutTests/platform/ios-sim/compositing/overflow/updating-scrolling-content-expected.txt (168076 => 168077)
--- trunk/LayoutTests/platform/ios-sim/compositing/overflow/updating-scrolling-content-expected.txt 2014-05-01 02:12:42 UTC (rev 168076)
+++ trunk/LayoutTests/platform/ios-sim/compositing/overflow/updating-scrolling-content-expected.txt 2014-05-01 02:15:15 UTC (rev 168077)
@@ -7,7 +7,7 @@
(GraphicsLayer
(position 8.00 8.00)
(bounds 200.00 200.00)
- (children 4
+ (children 3
(GraphicsLayer
(bounds 200.00 200.00)
(children 1
@@ -18,20 +18,15 @@
)
)
(GraphicsLayer
- (position 0.00 185.00)
- (bounds 185.00 15.00)
+ (position 0.00 200.00)
+ (bounds 200.00 0.00)
(drawsContent 1)
)
(GraphicsLayer
- (position 185.00 0.00)
- (bounds 15.00 185.00)
+ (position 200.00 0.00)
+ (bounds 0.00 200.00)
(drawsContent 1)
)
- (GraphicsLayer
- (position 185.00 185.00)
- (bounds 15.00 15.00)
- (drawsContent 1)
- )
)
)
)
