Index: sky/tests/examples/tabs-expected.txt |
diff --git a/sky/tests/examples/tabs-expected.txt b/sky/tests/examples/tabs-expected.txt |
index e93b9b8e7aac81b01f5c6dcb4f3b89dab5c233a3..56d7e2440e26da11d652b919e169f8ba92a9045a 100644 |
--- a/sky/tests/examples/tabs-expected.txt |
+++ b/sky/tests/examples/tabs-expected.txt |
@@ -10,32 +10,53 @@ PAINT FOR FRAME #2 ---------------------------------------------- |
2 | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
2 | | paintChild RenderFlex at Point(0.0, 81.0) |
2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | paintChild RenderTabBar at Point(0.0, 81.0) |
+2 | | | paintChild RenderDecoratedBox at Point(0.0, 81.0) |
2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | drawRect(Rect.fromLTRB(0.0, 81.0, 800.0, 129.0), Paint(color:Color(0xff3f51b5))) |
-2 | | | | paintChild RenderInkWell at Point(0.0, 81.0) |
+2 | | | | drawRect(Rect.fromLTRB(0.0, 81.0, 800.0, 129.0), Paint(color:Color(0xfffafafa))) |
+2 | | | | save |
+2 | | | | translate(0.0, 81.0) |
+2 | | | | concat([1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0]) |
+2 | | | | drawRect(Rect.fromLTRB(0.0, 0.0, 800.0, 48.0), Paint(color:Color(0xff3f51b5))) |
+2 | | | | paintChild RenderInkWell at Point(0.0, 0.0) |
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | paintChild RenderOpacity at Point(115.33333333333334, 97.0) |
+2 | | | | | paintChild RenderPositionedBox at Point(12.0, 0.0) |
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | translate(115.33333333333334, 97.0) |
-2 | | | | | | translate(-115.33333333333334, -97.0) |
-2 | | | | drawRect(Rect.fromLTRB(0.0, 127.0, 266.6666564941406, 129.0), Paint(color:Color(0xffff4081))) |
-2 | | | | paintChild RenderInkWell at Point(266.6666666666667, 81.0) |
+2 | | | | | | paintChild RenderOpacity at Point(82.0, 14.0) |
+2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | translate(82.0, 14.0) |
+2 | | | | | | | translate(-82.0, -14.0) |
+2 | | | | drawRect(Rect.fromLTRB(0.0, 46.0, 200.0, 48.0), Paint(color:Color(0xffff4081))) |
+2 | | | | paintChild RenderInkWell at Point(200.0, 0.0) |
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | paintChild RenderOpacity at Point(377.5, 97.0) |
+2 | | | | | paintChild RenderPositionedBox at Point(212.0, 0.0) |
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
-2 | | | | | | translate(377.5, 97.0) |
-2 | | | | | | translate(-377.5, -97.0) |
-2 | | | | | | restore |
-2 | | | | paintChild RenderInkWell at Point(533.3333333333334, 81.0) |
+2 | | | | | | paintChild RenderOpacity at Point(277.5, 14.0) |
+2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
+2 | | | | | | | translate(277.5, 14.0) |
+2 | | | | | | | translate(-277.5, -14.0) |
+2 | | | | | | | restore |
+2 | | | | paintChild RenderInkWell at Point(400.0, 0.0) |
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | paintChild RenderOpacity at Point(646.6666666666667, 97.0) |
+2 | | | | | paintChild RenderPositionedBox at Point(412.0, 0.0) |
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
-2 | | | | | | translate(646.6666666666667, 97.0) |
-2 | | | | | | translate(-646.6666666666667, -97.0) |
-2 | | | | | | restore |
+2 | | | | | | paintChild RenderOpacity at Point(480.0, 14.0) |
+2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
+2 | | | | | | | translate(480.0, 14.0) |
+2 | | | | | | | translate(-480.0, -14.0) |
+2 | | | | | | | restore |
+2 | | | | paintChild RenderInkWell at Point(600.0, 0.0) |
+2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | paintChild RenderPositionedBox at Point(612.0, 0.0) |
+2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | paintChild RenderOpacity at Point(672.0, 14.0) |
+2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
+2 | | | | | | | translate(672.0, 14.0) |
+2 | | | | | | | translate(-672.0, -14.0) |
+2 | | | | | | | restore |
+2 | | | | restore |
2 | | | paintChild RenderDecoratedBox at Point(0.0, 129.0) |
2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
2 | | | | drawRect(Rect.fromLTRB(0.0, 129.0, 800.0, 600.0), Paint(color:Color(0xffe8eaf6))) |
@@ -46,46 +67,61 @@ PAINT FOR FRAME #2 ---------------------------------------------- |
2 | | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffffffff), drawLooper:true)) |
2 | | | | | | saveLayer(Rect.fromLTRB(16.0, 145.0, 784.0, 584.0), Paint(color:Color(0xff000000))) |
2 | | | | | | clipRRect() |
-2 | | | | | | paintChild RenderTabBar at Point(16.0, 145.0) |
+2 | | | | | | paintChild RenderFlex at Point(24.0, 153.0) |
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | drawRect(Rect.fromLTRB(16.0, 145.0, 784.0, 193.0), Paint(color:Color(0xff3f51b5))) |
-2 | | | | | | | paintChild RenderInkWell at Point(16.0, 145.0) |
+2 | | | | | | | paintChild RenderDecoratedBox at Point(24.0, 153.0) |
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | paintChild RenderOpacity at Point(96.5, 159.0) |
+2 | | | | | | | | drawRect(Rect.fromLTRB(24.0, 153.0, 776.0, 201.0), Paint(color:Color(0xfffafafa))) |
+2 | | | | | | | | save |
+2 | | | | | | | | translate(24.0, 153.0) |
+2 | | | | | | | | concat([1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0]) |
+2 | | | | | | | | drawRect(Rect.fromLTRB(0.0, 0.0, 752.0, 48.0), Paint(color:Color(0xff3f51b5))) |
+2 | | | | | | | | paintChild RenderInkWell at Point(0.0, 0.0) |
2 | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | | translate(96.5, 159.0) |
-2 | | | | | | | | | translate(-96.5, -159.0) |
-2 | | | | | | | drawRect(Rect.fromLTRB(16.0, 191.0, 208.0, 193.0), Paint(color:Color(0xffff4081))) |
-2 | | | | | | | paintChild RenderInkWell at Point(208.0, 145.0) |
-2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | paintChild RenderOpacity at Point(287.0, 159.0) |
+2 | | | | | | | | | paintChild RenderPositionedBox at Point(12.0, 0.0) |
+2 | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | paintChild RenderOpacity at Point(78.5, 14.0) |
+2 | | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | | translate(78.5, 14.0) |
+2 | | | | | | | | | | | translate(-78.5, -14.0) |
+2 | | | | | | | | drawRect(Rect.fromLTRB(0.0, 46.0, 188.0, 48.0), Paint(color:Color(0xffff4081))) |
+2 | | | | | | | | paintChild RenderInkWell at Point(188.0, 0.0) |
2 | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
-2 | | | | | | | | | translate(287.0, 159.0) |
-2 | | | | | | | | | translate(-287.0, -159.0) |
-2 | | | | | | | | | restore |
-2 | | | | | | | paintChild RenderInkWell at Point(400.0, 145.0) |
-2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | paintChild RenderOpacity at Point(478.0, 159.0) |
+2 | | | | | | | | | paintChild RenderPositionedBox at Point(200.0, 0.0) |
+2 | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | paintChild RenderOpacity at Point(265.0, 14.0) |
+2 | | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
+2 | | | | | | | | | | | translate(265.0, 14.0) |
+2 | | | | | | | | | | | translate(-265.0, -14.0) |
+2 | | | | | | | | | | | restore |
+2 | | | | | | | | paintChild RenderInkWell at Point(376.0, 0.0) |
2 | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
-2 | | | | | | | | | translate(478.0, 159.0) |
-2 | | | | | | | | | translate(-478.0, -159.0) |
-2 | | | | | | | | | restore |
-2 | | | | | | | paintChild RenderInkWell at Point(592.0, 145.0) |
-2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | paintChild RenderOpacity at Point(668.0, 159.0) |
+2 | | | | | | | | | paintChild RenderPositionedBox at Point(388.0, 0.0) |
+2 | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | paintChild RenderOpacity at Point(452.0, 14.0) |
+2 | | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
+2 | | | | | | | | | | | translate(452.0, 14.0) |
+2 | | | | | | | | | | | translate(-452.0, -14.0) |
+2 | | | | | | | | | | | restore |
+2 | | | | | | | | paintChild RenderInkWell at Point(564.0, 0.0) |
2 | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
-2 | | | | | | | | | translate(668.0, 159.0) |
-2 | | | | | | | | | translate(-668.0, -159.0) |
-2 | | | | | | | | | restore |
-2 | | | | | | paintChild RenderPositionedBox at Point(343.0, 193.0) |
-2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | paintChild RenderParagraph at Point(343.0, 354.5) |
+2 | | | | | | | | | paintChild RenderPositionedBox at Point(576.0, 0.0) |
+2 | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | paintChild RenderOpacity at Point(638.0, 14.0) |
+2 | | | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) |
+2 | | | | | | | | | | | translate(638.0, 14.0) |
+2 | | | | | | | | | | | translate(-638.0, -14.0) |
+2 | | | | | | | | | | | restore |
+2 | | | | | | | | restore |
+2 | | | | | | | paintChild RenderPositionedBox at Point(343.0, 201.0) |
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
-2 | | | | | | | | translate(343.0, 354.5) |
-2 | | | | | | | | translate(-343.0, -354.5) |
+2 | | | | | | | | paintChild RenderParagraph at Point(343.0, 354.5) |
+2 | | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |
+2 | | | | | | | | | translate(343.0, 354.5) |
+2 | | | | | | | | | translate(-343.0, -354.5) |
2 | | | | | | restore |
2 | | paintChild RenderDecoratedBox at Point(0.0, 0.0) |
2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 |