diff options
Diffstat (limited to 'cc/test')
-rw-r--r-- | cc/test/data/10_10_layer_tree.json | 364 | ||||
-rw-r--r-- | cc/test/fake_scoped_ui_resource.cc | 29 | ||||
-rw-r--r-- | cc/test/fake_scoped_ui_resource.h | 5 | ||||
-rw-r--r-- | cc/test/layer_tree_json_parser.cc | 15 |
4 files changed, 115 insertions, 298 deletions
diff --git a/cc/test/data/10_10_layer_tree.json b/cc/test/data/10_10_layer_tree.json index be624e5..e2d7071 100644 --- a/cc/test/data/10_10_layer_tree.json +++ b/cc/test/data/10_10_layer_tree.json @@ -14,25 +14,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 2, 2 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, -55.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 2, 2 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -56,25 +52,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 200, 200 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 7.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ -8.0, -8.0 ] }, { - "Bounds": [ 4, 4 ], - "Border": [ 1, 1, 2, 2 ], + "Bounds": [ 0, 0 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 0.0, 0.0 ] @@ -118,25 +110,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 51 ], - "Border": [ 1, 1, 2, 2 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, -47.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 2, 2 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -152,11 +140,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 15.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -164,13 +150,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 859.8399658203125, 23.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 38, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -222,25 +206,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 82 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, -5.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -256,11 +236,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 57.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -268,13 +246,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 859.8399658203125, 65.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -326,25 +302,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 110 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 132.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -360,11 +332,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 194.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -372,13 +342,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 859.8399658203125, 202.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -430,25 +398,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 124 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 356.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -464,11 +428,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 418.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -476,13 +438,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 859.8399658203125, 426.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -534,25 +494,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 124 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 625.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -568,11 +524,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 687.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -580,13 +534,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 859.8399658203125, 695.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -638,23 +590,19 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 56 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 894.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.024660587310791, 0.0, 0.0, 0.0, 0.0, 1.024660587310791, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 118.47874069213867, 149.62063217163086, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -672,11 +620,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 956.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -684,13 +630,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 859.8399658203125, 964.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -742,25 +686,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 952.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -776,11 +716,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 1014.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -788,13 +726,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 384.8399658203125, 1001.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 231.8399658203125, 0.0 ] @@ -838,25 +774,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 960.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -872,11 +804,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 1022.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -884,13 +814,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 384.8399658203125, 951.828857421875, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 231.8399658203125, 0.0 ] @@ -934,25 +862,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 568.0, 968.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -976,25 +900,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 620.0, 1030.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ -8.0, -8.0 ] }, { - "Bounds": [ 3, 3 ], - "Border": [ 1, 1, 2, 2 ], + "Bounds": [ 0, 0 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 0.0, 0.0 ] @@ -1038,25 +958,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, -55.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1080,11 +996,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 7.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1092,13 +1006,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 15.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1142,25 +1054,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 45 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, -47.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1176,11 +1084,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 15.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1188,13 +1094,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 23.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1246,25 +1150,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 75 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, -25.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1280,11 +1180,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 37.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1292,13 +1190,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 45.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1350,25 +1246,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 103 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 91.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1384,11 +1276,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 153.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1396,13 +1286,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 161.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1454,25 +1342,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 123 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 295.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1488,11 +1372,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 357.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1500,13 +1382,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 365.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1558,25 +1438,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 124 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 561.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1592,11 +1468,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 623.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1604,13 +1478,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 631.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1662,25 +1534,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 77 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 830.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1712,11 +1580,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 892.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1724,13 +1590,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 900.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1782,25 +1646,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 952.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1816,11 +1676,9 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 1014.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", @@ -1828,13 +1686,11 @@ "Position": [ -8.0, -8.0 ] }, { "Bounds": [ 306, 60 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 261.8399658203125, 1012.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 37, 1, 1, 1 ], - "ImageBounds": [ 39, 3 ], + "ImageAperture": [ 38, 0, 0, 0 ], + "ImageBounds": [ 39, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 231.8399658203125, 0.0 ] @@ -1878,25 +1734,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 960.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -1912,25 +1764,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 1022.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ -8.0, -8.0 ] }, { - "Bounds": [ 3, 3 ], - "Border": [ 1, 1, 2, 2 ], + "Bounds": [ 0, 0 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 0.0, 0.0 ] @@ -1974,25 +1822,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 210, 40 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 3.125, 0.0, 0.0, 0.0, 0.0, 3.125, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -30.0, 968.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 31, 31, 1, 1 ], + "ImageAperture": [ 32, 32, 0, 0 ], "ImageBounds": [ 33, 33 ], "LayerType": "NinePatchLayer", "Opacity": 0.5, "Position": [ -60.0, -70.0 ] }, { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ -8.0, -8.0 ] @@ -2008,25 +1852,21 @@ "Bounds": [ 0, 0 ], "Children": [ { "Bounds": [ 553, 791 ], - "Border": [ 1, 1, 20, 20 ], "Children": [ ], "DrawTransform": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 22.0, 1030.0, 0.0, 1.0 ], "DrawsContent": true, - "FillCenter": false, "ImageAperture": [ 17, 35, 2, 1 ], "ImageBounds": [ 20, 37 ], "LayerType": "NinePatchLayer", "Opacity": 1.0, "Position": [ -8.0, -8.0 ] }, { - "Bounds": [ 3, 3 ], - "Border": [ 1, 1, 2, 2 ], + "Bounds": [ 0, 0 ], "Children": [ ], "DrawTransform": [ 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 ], "DrawsContent": true, - "FillCenter": false, - "ImageAperture": [ 1, 1, 1, 1 ], - "ImageBounds": [ 3, 3 ], + "ImageAperture": [ 0, 0, 0, 0 ], + "ImageBounds": [ 1, 1 ], "LayerType": "NinePatchLayer", "Opacity": 0.0, "Position": [ 0.0, 0.0 ] diff --git a/cc/test/fake_scoped_ui_resource.cc b/cc/test/fake_scoped_ui_resource.cc index bf86f54..ce5ee11 100644 --- a/cc/test/fake_scoped_ui_resource.cc +++ b/cc/test/fake_scoped_ui_resource.cc @@ -8,34 +8,25 @@ namespace cc { -namespace { - -UIResourceBitmap CreateMockUIResourceBitmap() { - SkBitmap skbitmap; - skbitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1); - skbitmap.allocPixels(); - skbitmap.setImmutable(); - return UIResourceBitmap(skbitmap); -} - -} // anonymous namespace - scoped_ptr<FakeScopedUIResource> FakeScopedUIResource::Create( LayerTreeHost* host) { return make_scoped_ptr(new FakeScopedUIResource(host)); } -FakeScopedUIResource::FakeScopedUIResource(LayerTreeHost* host) - : ScopedUIResource(host, CreateMockUIResourceBitmap()) { - // The constructor of ScopedUIResource already created a resource so we need - // to delete the created resource to wipe the state clean. - host_->DeleteUIResource(id_); +FakeScopedUIResource::FakeScopedUIResource(LayerTreeHost* host) { ResetCounters(); + bitmap_ = UIResourceBitmap::Create( + new uint8_t[1], + UIResourceBitmap::RGBA8, + UIResourceBitmap::CLAMP_TO_EDGE, + gfx::Size(1, 1)); + host_ = host; id_ = host_->CreateUIResource(this); } -UIResourceBitmap FakeScopedUIResource::GetBitmap(UIResourceId uid, - bool resource_lost) { +scoped_refptr<UIResourceBitmap> FakeScopedUIResource::GetBitmap( + UIResourceId uid, + bool resource_lost) { resource_create_count++; if (resource_lost) lost_resource_count++; diff --git a/cc/test/fake_scoped_ui_resource.h b/cc/test/fake_scoped_ui_resource.h index 970d7b0..84c097f 100644 --- a/cc/test/fake_scoped_ui_resource.h +++ b/cc/test/fake_scoped_ui_resource.h @@ -16,8 +16,9 @@ class FakeScopedUIResource : public ScopedUIResource { public: static scoped_ptr<FakeScopedUIResource> Create(LayerTreeHost* host); - virtual UIResourceBitmap GetBitmap(UIResourceId uid, - bool resource_lost) OVERRIDE; + virtual scoped_refptr<UIResourceBitmap> GetBitmap( + UIResourceId uid, + bool resource_lost) OVERRIDE; void ResetCounters(); int resource_create_count; diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc index 1c47e1e..51c421f 100644 --- a/cc/test/layer_tree_json_parser.cc +++ b/cc/test/layer_tree_json_parser.cc @@ -54,29 +54,14 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val, success &= list->GetInteger(0, &image_width); success &= list->GetInteger(1, &image_height); - success &= dict->GetList("Border", &list); - int border_x, border_y, border_width, border_height; - success &= list->GetInteger(0, &border_x); - success &= list->GetInteger(1, &border_y); - success &= list->GetInteger(2, &border_width); - success &= list->GetInteger(3, &border_height); - - bool fill_center; - success &= dict->GetBoolean("FillCenter", &fill_center); - scoped_refptr<NinePatchLayer> nine_patch_layer = NinePatchLayer::Create(); SkBitmap bitmap; bitmap.setConfig(SkBitmap::kARGB_8888_Config, image_width, image_height); bitmap.allocPixels(NULL, NULL); - bitmap.setImmutable(); nine_patch_layer->SetBitmap(bitmap, gfx::Rect(aperture_x, aperture_y, aperture_width, aperture_height)); - nine_patch_layer->SetBorder( - gfx::Rect(border_x, border_y, border_width, border_height)); - nine_patch_layer->SetFillCenter(fill_center); - new_layer = nine_patch_layer; } else if (layer_type == "PictureLayer") { new_layer = PictureLayer::Create(content_client); |