You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/08 16:04:15 UTC

[60/62] [abbrv] git commit: [flex-sdk] [refs/heads/release4.11.0] - Revert "Merge Apache Flex 4.10 into trunk"

Revert "Merge Apache Flex 4.10 into trunk"

This reverts commit 1a4946a90099d312c9a3468c34927569542367e4, reversing
changes made to 97bedf755c9220026a3139730645e1bdfa5ab677.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4f206356
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4f206356
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4f206356

Branch: refs/heads/release4.11.0
Commit: 4f20635628acdc09e8739c5f94ec644d20cbd959
Parents: 1a4946a
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Jul 29 01:13:35 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Jul 29 01:13:35 2013 +1000

----------------------------------------------------------------------
 .../apache/bundles/fr_AR/apache.properties      |  18 ----
 .../bundles/fr_AR/experimental.properties       |  18 ----
 .../components/gridClasses/GridSelection.as     |   4 +-
 frameworks/projects/textLayout/build.xml        |   1 -
 .../AIR_WindowedApplication_Properties.mxml     |  19 ----
 ...IR_WindowedApplication_Properties_Spark.mxml |  19 ----
 .../baselines/height_test3_SparkChrome.png      | Bin 80 -> 80 bytes
 .../baselines/height_test3_SparkChrome_mac.png  | Bin 80 -> 80 bytes
 .../height_test3_windowedApplicationSkin.png    | Bin 74 -> 74 bytes
 .../height_test4_windowedApplicationSkin.png    | Bin 346 -> 346 bytes
 .../height_test5_windowedApplicationSkin.png    | Bin 570 -> 570 bytes
 .../height_test6_windowedApplicationSkin.png    | Bin 525 -> 524 bytes
 .../height_test7_windowedApplicationSkin.png    | Bin 597 -> 591 bytes
 .../maximizable_false_test4_SparkChrome_mac.png | Bin 259 -> 286 bytes
 .../baselines/status_test2_systemChrome.png     | Bin 319 -> 319 bytes
 .../titleBar_test10_SparkChrome_mac.png         | Bin 259 -> 286 bytes
 .../titleBar_test3_SparkChrome_mac.png          | Bin 260 -> 288 bytes
 .../titleBar_test4_SparkChrome_mac.png          | Bin 241 -> 263 bytes
 .../titleBar_test5_SparkChrome_mac.png          | Bin 265 -> 292 bytes
 .../titleBar_test6_SparkChrome_mac.png          | Bin 263 -> 297 bytes
 .../titleBar_test7_SparkChrome_mac.png          | Bin 245 -> 271 bytes
 .../titleBar_test8_SparkChrome_mac.png          | Bin 273 -> 304 bytes
 .../titleBar_test9a_SparkChrome_mac.png         | Bin 259 -> 286 bytes
 .../titleBar_test9b_SparkChrome_mac.png         | Bin 260 -> 288 bytes
 .../titleBar_test9c_SparkChrome_mac.png         | Bin 263 -> 297 bytes
 .../Window/styles/baselines/skinClass_test1.png | Bin 452 -> 451 bytes
 .../Window/styles/baselines/skinClass_test4.png | Bin 452 -> 451 bytes
 .../properties/wa_properties_height_tests.mxml  |   2 +-
 .../BubbleSeries_sameAxis_diffRenderers.png     | Bin
 ...CandlestickSeries_sameAxis_diffRenderers.png | Bin
 .../ColumnSeries_sameAxis_diffRenderers.png     | Bin
 .../HLOCSeries_sameAxis_diffRenderers.png       | Bin
 .../LineSeries_sameAxis_diffRenderers.png       | Bin
 .../LineSeries_selectionMode_Multiple.png       | Bin
 .../LineSeries_selectionMode_Single.png         | Bin
 .../PieSeries_selectionMode_Multiple.png        | Bin
 .../Baselines/PieSeries_selectionMode_None.png  | Bin
 .../PieSeries_selectionMode_Single.png          | Bin
 .../Baselines/PlotSeries_axisAtSeriesLevel.png  | Bin
 .../PlotSeries_sameAxis_diffRenderers.png       | Bin
 .../Border/Properties/Border_Properties.mxml    |   4 +-
 .../ActionBar_ViewNavigator_Properties.mxml     |   2 +-
 ...temRendererFunction_test1@android_240ppi.png | Bin 487 -> 506 bytes
 .../properties/Label_Properties_tester1.mxml    |   6 +-
 .../properties/Label_Properties_tester2.mxml    |   2 +-
 .../baselines/Label_minWidth_5@240ppi.png       | Bin 88 -> 93 bytes
 .../baselines/Label_width_10@240ppi.png         | Bin 110 -> 117 bytes
 ...nds_blend_darken_radialgradient_fill@win.png | Bin 29220 -> 0 bytes
 ...blend_difference_radialgradient_fill@win.png | Bin 29149 -> 0 bytes
 ..._blend_hardlight_radialgradient_fill@win.png | Bin 25133 -> 0 bytes
 ...ends_blend_layer_radialgradient_fill@win.png | Bin 29220 -> 0 bytes
 ...s_blend_multiply_radialgradient_fill@win.png | Bin 29220 -> 0 bytes
 ...nds_blend_normal_radialgradient_fill@win.png | Bin 29220 -> 0 bytes
 ...s_blend_subtract_radialgradient_fill@win.png | Bin 29149 -> 0 bytes
 .../baselines/doc_structure_graphic_def@win.png | Bin 31759 -> 0 bytes
 .../baselines/doc_structure_library_def@win.png | Bin 27262 -> 0 bytes
 ...adial_gradient_fill_path_focal_point@win.png | Bin 46826 -> 0 bytes
 ...ial_gradient_fill_path_interpolation@win.png | Bin 50103 -> 0 bytes
 ...ent_radial_gradient_fill_path_matrix@win.png | Bin 11947 -> 0 bytes
 ...nt_radial_gradient_fill_path_spread2@win.png | Bin 30643 -> 0 bytes
 ...ent_radial_gradient_fill_path_spread@win.png | Bin 52767 -> 0 bytes
 ...dial_gradient_fill_shape_focal_point@win.png | Bin 37978 -> 0 bytes
 ...al_gradient_fill_shape_interpolation@win.png | Bin 43504 -> 0 bytes
 ...nt_radial_gradient_fill_shape_matrix@win.png | Bin 10215 -> 0 bytes
 ...nt_radial_gradient_fill_shape_spread@win.png | Bin 53505 -> 0 bytes
 .../baselines/filters_bevelfilter3@win.png      | Bin 19983 -> 0 bytes
 .../baselines/filters_blurfilter@win.png        | Bin 81394 -> 0 bytes
 .../baselines/filters_filters_group@win.png     | Bin 24862 -> 0 bytes
 .../baselines/filters_filters_transform@win.png | Bin 41206 -> 0 bytes
 .../baselines/filters_glowfilter3@win.png       | Bin 11192 -> 0 bytes
 .../filters_gradientglowfilter3@win.png         | Bin 12340 -> 0 bytes
 .../filters_hue_colormatrixfilter4@win.png      | Bin 25395 -> 0 bytes
 ...filters_luminance_colormatrixfilter4@win.png | Bin 21821 -> 0 bytes
 ...ilters_saturation_colormatrixfilter4@win.png | Bin 28619 -> 0 bytes
 .../properties/baselines/mask_clip_mask@win.png | Bin 48695 -> 0 bytes
 ...ial_gradient_stroke_path_focal_point@win.png | Bin 35733 -> 0 bytes
 ...l_gradient_stroke_path_interpolation@win.png | Bin 37723 -> 0 bytes
 ...e_radial_gradient_stroke_path_matrix@win.png | Bin 14679 -> 0 bytes
 ...e_radial_gradient_stroke_path_spread@win.png | Bin 63610 -> 0 bytes
 ...al_gradient_stroke_shape_focal_point@win.png | Bin 27206 -> 0 bytes
 ..._gradient_stroke_shape_interpolation@win.png | Bin 29508 -> 0 bytes
 ..._radial_gradient_stroke_shape_matrix@win.png | Bin 17790 -> 0 bytes
 ..._radial_gradient_stroke_shape_spread@win.png | Bin 82818 -> 0 bytes
 .../core/fxg/properties/fxgtemplate_masks.mxml  |   4 +-
 .../core/fxg/properties/fxgtemplate_tester.mxml | 104 +++++--------------
 .../properties/FXG_Ellipse_Mirroring.mxml       |   8 +-
 .../properties/FXG_Ellipse_PropertiesAS.mxml    |  52 +++-------
 ...G_Ellipse_RadialGradientStroke_fillX@win.png | Bin 3352 -> 0 bytes
 ...G_Ellipse_RadialGradientStroke_fillY@win.png | Bin 3925 -> 0 bytes
 ...Ellipse_RadialGradientStroke_strokeX@win.png | Bin 3350 -> 0 bytes
 ...Ellipse_RadialGradientStroke_strokeY@win.png | Bin 4121 -> 0 bytes
 ..._Ellipse_RadialGradientStroke_xy_0_0@win.png | Bin 3626 -> 0 bytes
 ...Ellipse_RadialGradientStroke_xy_0_20@win.png | Bin 3675 -> 0 bytes
 ...Ellipse_RadialGradientStroke_xy_20_0@win.png | Bin 3698 -> 0 bytes
 ...RadialGradientStroke_xy_fillRotation@win.png | Bin 4430 -> 0 bytes
 ...dialGradientStroke_xy_strokeRotation@win.png | Bin 4213 -> 0 bytes
 ...otation_matrix_onRadialGradient_fill@win.png | Bin 3091 -> 0 bytes
 ...ation_matrix_onRadialGradient_stroke@win.png | Bin 2779 -> 0 bytes
 ...ipse_XY_matrix_onRadialGradient_fill@win.png | Bin 3939 -> 0 bytes
 ...se_XY_matrix_onRadialGradient_stroke@win.png | Bin 3870 -> 0 bytes
 ...tionRTL_RadialGradientStroke_strokeY@win.png | Bin 4122 -> 0 bytes
 ...tionRTL_RadialGradientStroke_xy_0_20@win.png | Bin 3676 -> 0 bytes
 .../Rect/properties/FXG_Rect_PropertiesAS.mxml  |  52 +++-------
 .../FXG_Rect_RadialGradientStroke_fillX@win.png | Bin 2518 -> 0 bytes
 .../FXG_Rect_RadialGradientStroke_fillY@win.png | Bin 3175 -> 0 bytes
 ...XG_Rect_RadialGradientStroke_strokeX@win.png | Bin 2943 -> 0 bytes
 ...XG_Rect_RadialGradientStroke_strokeY@win.png | Bin 3382 -> 0 bytes
 ...FXG_Rect_RadialGradientStroke_xy_0_0@win.png | Bin 2925 -> 0 bytes
 ...XG_Rect_RadialGradientStroke_xy_0_20@win.png | Bin 2966 -> 0 bytes
 ...XG_Rect_RadialGradientStroke_xy_20_0@win.png | Bin 2971 -> 0 bytes
 ...RadialGradientStroke_xy_fillRotation@win.png | Bin 4080 -> 0 bytes
 ...dialGradientStroke_xy_strokeRotation@win.png | Bin 3630 -> 0 bytes
 ...otation_matrix_onRadialGradient_fill@win.png | Bin 2217 -> 0 bytes
 ...ation_matrix_onRadialGradient_stroke@win.png | Bin 2426 -> 0 bytes
 ...Rect_XY_matrix_onRadialGradient_fill@win.png | Bin 3765 -> 0 bytes
 ...ct_XY_matrix_onRadialGradient_stroke@win.png | Bin 3614 -> 0 bytes
 116 files changed, 64 insertions(+), 251 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/frameworks/projects/apache/bundles/fr_AR/apache.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/apache/bundles/fr_AR/apache.properties b/frameworks/projects/apache/bundles/fr_AR/apache.properties
deleted file mode 100644
index 29940f7..0000000
--- a/frameworks/projects/apache/bundles/fr_AR/apache.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-##
-##  Licensed to the Apache Software Foundation (ASF) under one or more
-##  contributor license agreements.  See the NOTICE file distributed with
-##  this work for additional information regarding copyright ownership.
-##  The ASF licenses this file to You under the Apache License, Version 2.0
-##  (the "License"); you may not use this file except in compliance with
-##  the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-##  Unless required by applicable law or agreed to in writing, software
-##  distributed under the License is distributed on an "AS IS" BASIS,
-##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-##  See the License for the specific language governing permissions and
-##  limitations under the License.
-##
-################################################################################

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/frameworks/projects/experimental/bundles/fr_AR/experimental.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/bundles/fr_AR/experimental.properties b/frameworks/projects/experimental/bundles/fr_AR/experimental.properties
deleted file mode 100644
index 29940f7..0000000
--- a/frameworks/projects/experimental/bundles/fr_AR/experimental.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-##
-##  Licensed to the Apache Software Foundation (ASF) under one or more
-##  contributor license agreements.  See the NOTICE file distributed with
-##  this work for additional information regarding copyright ownership.
-##  The ASF licenses this file to You under the Apache License, Version 2.0
-##  (the "License"); you may not use this file except in compliance with
-##  the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-##  Unless required by applicable law or agreed to in writing, software
-##  distributed under the License is distributed on an "AS IS" BASIS,
-##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-##  See the License for the specific language governing permissions and
-##  limitations under the License.
-##
-################################################################################

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
index 88d01c6..bc28723 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
@@ -1389,7 +1389,7 @@ public class GridSelection
         var selectionChanged:Boolean = false;
         
         const oldRowIndex:int = event.oldLocation;
-        var newRowIndex:int = event.location;
+        const newRowIndex:int = event.location;
         
         selectionChanged = handleRowRemove(oldRowIndex);
         
@@ -1664,7 +1664,7 @@ public class GridSelection
             return false;
 
         const oldColumnIndex:int = event.oldLocation;
-        var newColumnIndex:int = event.location;
+        const newColumnIndex:int = event.location;
         
         var selectionChanged:Boolean = handleColumnRemove(oldColumnIndex);
         

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml b/frameworks/projects/textLayout/build.xml
index 7a2fb90..5dacbc9 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -25,7 +25,6 @@
 	<property file="${FLEX_HOME}/local.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
-    <property name="source.dir" value="${basedir}/${tlf.version}"/>
 	<property name="output.file" value="${FLEX_HOME}/frameworks/libs/textLayout.swc"/>
 	<property name="output.docs" value="${FLEX_HOME}/tempDoc"/>
 	<property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml b/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
index 4db95ab..9dcff76 100644
--- a/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
+++ b/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
@@ -97,14 +97,6 @@
 				<AssertPropertyValue target="" propertyName="height" value="34" />
 			</body>
 		</TestCase>
-		<TestCase testID="Window_Property_height_negative_win" keywords="[Window,property, height]">
-			<setup>
-				<SetProperty target="" propertyName="height" value="-800" waitEvent="updateComplete" waitTarget=""/>
-			</setup>
-			<body>
-				<AssertPropertyValue target="" propertyName="height" value="38" />
-			</body>
-		</TestCase>
 		
 		<TestCase testID="Window_Property_maxHeight_positive" keywords="[Window,property, maximumHeight]">
 			<setup>
@@ -139,17 +131,6 @@
 				<AssertPropertyValue target="" propertyName="height" value="34" />
 			</body> 
 		</TestCase>		
-		<TestCase testID="Window_Property_maxHeight_negative_win" keywords="[Window,property, maximumHeight]">
-			<setup>
-				<SetProperty target="" propertyName="maxHeight" value="-300"/> 
-				<SetProperty target="" propertyName="height" value="375" waitTarget="" waitEvent="updateComplete"/>
-				<WaitForEffectsToEnd/>
-			</setup>  
-			<body>  
-				<AssertPropertyValue target="" propertyName="maxHeight" value="38" /> 
-				<AssertPropertyValue target="" propertyName="height" value="38" />
-			</body> 
-		</TestCase>		
 		<TestCase testID="Window_Property_width_positive" keywords="[Window,width, Property]">
 			<setup>
 				<SetProperty target="" propertyName="width" value="800" waitEvent="updateComplete" waitTarget=""/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml b/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
index 20e0800..3b87f4c 100644
--- a/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
+++ b/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
@@ -97,14 +97,6 @@
 				<AssertPropertyValue target="" propertyName="height" value="34" />
 			</body>
 		</TestCase>
-		<TestCase testID="Window_Property_height_negative_win" keywords="[Window,property, height]">
-			<setup>
-				<SetProperty target="" propertyName="height" value="-800" waitEvent="updateComplete" waitTarget=""/>
-			</setup>
-			<body>
-				<AssertPropertyValue target="" propertyName="height" value="38" />
-			</body>
-		</TestCase>
 		
 		<TestCase testID="Window_Property_maxHeight_positive" keywords="[Window,property, maximumHeight]">
 			<setup>
@@ -139,17 +131,6 @@
 				<AssertPropertyValue target="" propertyName="height" value="34" />
 			</body> 
 		</TestCase>		
-		<TestCase testID="Window_Property_maxHeight_negative_win" keywords="[Window,property, maximumHeight]">
-			<setup>
-				<SetProperty target="" propertyName="maxHeight" value="-300"/> 
-				<SetProperty target="" propertyName="height" value="375" waitTarget="" waitEvent="updateComplete"/>
-				<WaitForEffectsToEnd/>
-			</setup>  
-			<body>  
-				<AssertPropertyValue target="" propertyName="maxHeight" value="38" /> 
-				<AssertPropertyValue target="" propertyName="height" value="38" />
-			</body> 
-		</TestCase>		
 		<TestCase testID="Window_Property_width_positive" keywords="[Window,width, Property]">
 			<setup>
 				<SetProperty target="" propertyName="width" value="800" waitEvent="updateComplete" waitTarget=""/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome.png
index 82ff76a..d254a62 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome_mac.png
index 12899e0..d254a62 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_windowedApplicationSkin.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_windowedApplicationSkin.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_windowedApplicationSkin.png
index fa49b85..7526e50 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_windowedApplicationSkin.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test3_windowedApplicationSkin.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test4_windowedApplicationSkin.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test4_windowedApplicationSkin.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test4_windowedApplicationSkin.png
index a315143..25989dc 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test4_windowedApplicationSkin.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test4_windowedApplicationSkin.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test5_windowedApplicationSkin.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test5_windowedApplicationSkin.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test5_windowedApplicationSkin.png
index b6e9a61..57a6877 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test5_windowedApplicationSkin.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test5_windowedApplicationSkin.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test6_windowedApplicationSkin.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test6_windowedApplicationSkin.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test6_windowedApplicationSkin.png
index 0b949a3..cfef6be 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test6_windowedApplicationSkin.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test6_windowedApplicationSkin.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test7_windowedApplicationSkin.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test7_windowedApplicationSkin.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test7_windowedApplicationSkin.png
index 8ca889d..798db5e 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test7_windowedApplicationSkin.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/height_test7_windowedApplicationSkin.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/maximizable_false_test4_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/maximizable_false_test4_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/maximizable_false_test4_SparkChrome_mac.png
index 27904bc..de2b0b3 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/maximizable_false_test4_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/maximizable_false_test4_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/properties/baselines/status_test2_systemChrome.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/properties/baselines/status_test2_systemChrome.png b/mustella/tests/apollo/spark/components/Window/properties/baselines/status_test2_systemChrome.png
index b81578f..f33f841 100644
Binary files a/mustella/tests/apollo/spark/components/Window/properties/baselines/status_test2_systemChrome.png and b/mustella/tests/apollo/spark/components/Window/properties/baselines/status_test2_systemChrome.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test10_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test10_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test10_SparkChrome_mac.png
index 27904bc..de2b0b3 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test10_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test10_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test3_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test3_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test3_SparkChrome_mac.png
index c13e016..e77221c 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test3_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test3_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test4_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test4_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test4_SparkChrome_mac.png
index ed4937d..8e92c4e 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test4_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test4_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test5_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test5_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test5_SparkChrome_mac.png
index ef795a0..9fe1821 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test5_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test5_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test6_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test6_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test6_SparkChrome_mac.png
index 8df739f..64aedce 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test6_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test6_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test7_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test7_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test7_SparkChrome_mac.png
index 5117623..786334e 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test7_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test7_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test8_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test8_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test8_SparkChrome_mac.png
index 11f87d3..2e22858 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test8_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test8_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9a_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9a_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9a_SparkChrome_mac.png
index 27904bc..de2b0b3 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9a_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9a_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9b_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9b_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9b_SparkChrome_mac.png
index c13e016..e77221c 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9b_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9b_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9c_SparkChrome_mac.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9c_SparkChrome_mac.png b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9c_SparkChrome_mac.png
index 8df739f..64aedce 100644
Binary files a/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9c_SparkChrome_mac.png and b/mustella/tests/apollo/spark/components/Window/skin/baselines/titleBar_test9c_SparkChrome_mac.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test1.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test1.png b/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test1.png
index c705c48..1182c76 100644
Binary files a/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test1.png and b/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test1.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test4.png
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test4.png b/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test4.png
index c705c48..1182c76 100644
Binary files a/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test4.png and b/mustella/tests/apollo/spark/components/Window/styles/baselines/skinClass_test4.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml b/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
index 228500a..21f5148 100644
--- a/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
+++ b/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
@@ -147,7 +147,7 @@ Test height
         <SetStyle target="" styleName="skinClass" valueExpression="value = SparkChromeWindowedApplicationSkin" waitEvent="updateComplete" />
         <SetProperty target="" propertyName="width" value="600" />
         <SetProperty target="" propertyName="height" value="35" waitEvent="resize" />
-        <AssertPropertyValue target="" propertyName="height" value="38" />
+        <AssertPropertyValue target="" propertyName="height" value="35" />
         <CompareBitmap target="" url="../properties/baselines/$testID.png" />
     </body>
 </TestCase>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Bubble/Properties/Baselines/BubbleSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Bubble/Properties/Baselines/BubbleSeries_sameAxis_diffRenderers.png b/mustella/tests/components/Charts/Bubble/Properties/Baselines/BubbleSeries_sameAxis_diffRenderers.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Candle/Properties/Baselines/CandlestickSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Candle/Properties/Baselines/CandlestickSeries_sameAxis_diffRenderers.png b/mustella/tests/components/Charts/Candle/Properties/Baselines/CandlestickSeries_sameAxis_diffRenderers.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Column/Properties/Baselines/ColumnSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Column/Properties/Baselines/ColumnSeries_sameAxis_diffRenderers.png b/mustella/tests/components/Charts/Column/Properties/Baselines/ColumnSeries_sameAxis_diffRenderers.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/HLOC/Properties/Baselines/HLOCSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/HLOC/Properties/Baselines/HLOCSeries_sameAxis_diffRenderers.png b/mustella/tests/components/Charts/HLOC/Properties/Baselines/HLOCSeries_sameAxis_diffRenderers.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_sameAxis_diffRenderers.png b/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_sameAxis_diffRenderers.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Multiple.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Multiple.png b/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Multiple.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Single.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Single.png b/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Single.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Multiple.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Multiple.png b/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Multiple.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_None.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_None.png b/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_None.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Single.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Single.png b/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Single.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_axisAtSeriesLevel.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_axisAtSeriesLevel.png b/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_axisAtSeriesLevel.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_sameAxis_diffRenderers.png b/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_sameAxis_diffRenderers.png
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml b/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
index 61c5527..c7d9b29 100644
--- a/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
+++ b/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
@@ -322,9 +322,7 @@
 		</setup>
 		<body>						
 			<SetProperty target="myBorderGrpRGS.myBorder.borderStroke" propertyName="weight" value="80" waitEvent="updateComplete" waitTarget="myBorderGrpRGS.myBorder"/>
-			<CompareBitmap url="../Properties/Baselines/$testID_1.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS">
-				<ConditionalValue os="win" url="../Properties/Baselines/$testID_1@win.png"/>
-			</CompareBitmap>
+			<CompareBitmap url="../Properties/Baselines/$testID_1.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS" />
 			<SetProperty target="myBorderGrpRGS.myBorder" propertyName="height" value="300" waitEvent="updateComplete" />
 			<SetProperty target="myBorderGrpRGS.myBorder" propertyName="width" value="300" waitEvent="updateComplete" />
 			<CompareBitmap url="../Properties/Baselines/$testID_2.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS" />

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml b/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
index 282834d..0084843 100644
--- a/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
+++ b/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
@@ -1171,7 +1171,7 @@
 				<ResetComponent target="navigator.actionBar" className="spark.components.actionBar"/>
 				<WaitForLayoutManager />
 				<SetProperty target="navigator.actionBar" propertyName="navigationContent" valueExpression="value=twoEArray" waitTarget="navigator.actionBar" waitEvent="updateComplete"/>
-				<WaitForLayoutManager />
+				<Pause timeout="300" />
 			</setup>
 			<body>
 				<CompareBitmap url="../properties/baselines" target="navigator.actionBar">

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png b/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png
index 8373019..023d524 100644
Binary files a/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png and b/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml b/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
index a980edc..08ac128 100644
--- a/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
+++ b/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
@@ -68,7 +68,7 @@
 			    <AssertPropertyValue target="navigator.activeView.lbl1" propertyName="width" value="0" />
 			    <AssertPropertyValue target="navigator.activeView.lbl1" propertyName="height" >
 					<ConditionalValue deviceDensity="160" os="win" value="15" />
-					<ConditionalValue deviceDensity="240" value="22" />
+					<ConditionalValue deviceDensity="240" value="25" />
 					<ConditionalValue deviceDensity="320" value="30" />
 					<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 				</AssertPropertyValue>
@@ -126,7 +126,7 @@
 				</AssertPropertyValue>
 			    <AssertPropertyValue target="navigator.activeView.lbl1" propertyName="height" >
 					<ConditionalValue deviceDensity="160" os="win" value="15" />
-					<ConditionalValue deviceDensity="240" value="22" />
+					<ConditionalValue deviceDensity="240" value="25" />
 					<ConditionalValue deviceDensity="320" value="30" />
 					<ConditionalValue deviceDensity="160" os="qnx" value="16"/>
 			    </AssertPropertyValue>
@@ -157,7 +157,7 @@
 				</AssertPropertyValue>
 			    <AssertPropertyValue target="navigator.activeView.lbl1" propertyName="height" value="82" >
 					<ConditionalValue deviceDensity="160" os="win" value="53" />
-					<ConditionalValue deviceDensity="240" value="80" />
+					<ConditionalValue deviceDensity="240" value="82" />
 					<ConditionalValue deviceDensity="320" value="106" />
 					<ConditionalValue deviceDensity="160" os="qnx" value="55"/>
 				</AssertPropertyValue>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml b/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
index 8c9246d..806f470 100644
--- a/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
+++ b/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
@@ -60,7 +60,7 @@
 			<body>
 				<AssertPropertyValue propertyName="height" target="navigator.activeView.lbl1">
 					<ConditionalValue deviceDensity="160" os="win" value="15" />
-					<ConditionalValue deviceDensity="240" value="22" />
+					<ConditionalValue deviceDensity="240" value="25" />
 					<ConditionalValue deviceDensity="320" value="30" />
 					<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 				</AssertPropertyValue>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/mobile/components/Label/properties/baselines/Label_minWidth_5@240ppi.png
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/components/Label/properties/baselines/Label_minWidth_5@240ppi.png b/mustella/tests/mobile/components/Label/properties/baselines/Label_minWidth_5@240ppi.png
index 7132906..4ecc058 100644
Binary files a/mustella/tests/mobile/components/Label/properties/baselines/Label_minWidth_5@240ppi.png and b/mustella/tests/mobile/components/Label/properties/baselines/Label_minWidth_5@240ppi.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/mobile/components/Label/properties/baselines/Label_width_10@240ppi.png
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/components/Label/properties/baselines/Label_width_10@240ppi.png b/mustella/tests/mobile/components/Label/properties/baselines/Label_width_10@240ppi.png
index 7a5b682..e6ec69e 100644
Binary files a/mustella/tests/mobile/components/Label/properties/baselines/Label_width_10@240ppi.png and b/mustella/tests/mobile/components/Label/properties/baselines/Label_width_10@240ppi.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_darken_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_darken_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_darken_radialgradient_fill@win.png
deleted file mode 100644
index 446ca63..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_darken_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_difference_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_difference_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_difference_radialgradient_fill@win.png
deleted file mode 100644
index 969e681..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_difference_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_hardlight_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_hardlight_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_hardlight_radialgradient_fill@win.png
deleted file mode 100644
index e78225c..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_hardlight_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_layer_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_layer_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_layer_radialgradient_fill@win.png
deleted file mode 100644
index 446ca63..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_layer_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_multiply_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_multiply_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_multiply_radialgradient_fill@win.png
deleted file mode 100644
index 446ca63..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_multiply_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_normal_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_normal_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_normal_radialgradient_fill@win.png
deleted file mode 100644
index 446ca63..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_normal_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_subtract_radialgradient_fill@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_subtract_radialgradient_fill@win.png b/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_subtract_radialgradient_fill@win.png
deleted file mode 100644
index 969e681..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/blend_mode_radial_gradient_blends_blend_subtract_radialgradient_fill@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_graphic_def@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_graphic_def@win.png b/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_graphic_def@win.png
deleted file mode 100644
index 031e965..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_graphic_def@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_library_def@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_library_def@win.png b/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_library_def@win.png
deleted file mode 100644
index 8c7a173f..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/doc_structure_library_def@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_focal_point@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_focal_point@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_focal_point@win.png
deleted file mode 100644
index c8bbd0a..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_focal_point@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_interpolation@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_interpolation@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_interpolation@win.png
deleted file mode 100644
index 6706ebc..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_interpolation@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_matrix@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_matrix@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_matrix@win.png
deleted file mode 100644
index 195d56a..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_matrix@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread2@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread2@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread2@win.png
deleted file mode 100644
index fc88707..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread2@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread@win.png
deleted file mode 100644
index ec9e87f..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_path_spread@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_focal_point@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_focal_point@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_focal_point@win.png
deleted file mode 100644
index 8b0e3ce..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_focal_point@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_interpolation@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_interpolation@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_interpolation@win.png
deleted file mode 100644
index 46ecaa5..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_interpolation@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_matrix@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_matrix@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_matrix@win.png
deleted file mode 100644
index 569642c..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_matrix@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_spread@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_spread@win.png b/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_spread@win.png
deleted file mode 100644
index a71bfb2..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/fill_radial_gradient_radial_gradient_fill_shape_spread@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_bevelfilter3@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_bevelfilter3@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_bevelfilter3@win.png
deleted file mode 100644
index 6a5d2b7..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_bevelfilter3@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_blurfilter@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_blurfilter@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_blurfilter@win.png
deleted file mode 100644
index b8f3081..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_blurfilter@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_group@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_group@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_group@win.png
deleted file mode 100644
index 0b141e2..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_group@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_transform@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_transform@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_transform@win.png
deleted file mode 100644
index b0ed0de..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_filters_transform@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_glowfilter3@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_glowfilter3@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_glowfilter3@win.png
deleted file mode 100644
index c032d8e..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_glowfilter3@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_gradientglowfilter3@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_gradientglowfilter3@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_gradientglowfilter3@win.png
deleted file mode 100644
index 1f8bd45..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_gradientglowfilter3@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_hue_colormatrixfilter4@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_hue_colormatrixfilter4@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_hue_colormatrixfilter4@win.png
deleted file mode 100644
index 04bfa82..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_hue_colormatrixfilter4@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_luminance_colormatrixfilter4@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_luminance_colormatrixfilter4@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_luminance_colormatrixfilter4@win.png
deleted file mode 100644
index f2735f9..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_luminance_colormatrixfilter4@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/filters_saturation_colormatrixfilter4@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/filters_saturation_colormatrixfilter4@win.png b/mustella/tests/spark/core/fxg/properties/baselines/filters_saturation_colormatrixfilter4@win.png
deleted file mode 100644
index c05433a..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/filters_saturation_colormatrixfilter4@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/mask_clip_mask@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/mask_clip_mask@win.png b/mustella/tests/spark/core/fxg/properties/baselines/mask_clip_mask@win.png
deleted file mode 100644
index cc0eceb..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/mask_clip_mask@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_focal_point@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_focal_point@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_focal_point@win.png
deleted file mode 100644
index 3ec5b23..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_focal_point@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_interpolation@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_interpolation@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_interpolation@win.png
deleted file mode 100644
index 63ea694..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_interpolation@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_matrix@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_matrix@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_matrix@win.png
deleted file mode 100644
index faed639..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_matrix@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_spread@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_spread@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_spread@win.png
deleted file mode 100644
index a01ef3d..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_path_spread@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_focal_point@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_focal_point@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_focal_point@win.png
deleted file mode 100644
index 8d4f923..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_focal_point@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_interpolation@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_interpolation@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_interpolation@win.png
deleted file mode 100644
index 6975cdb..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_interpolation@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_matrix@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_matrix@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_matrix@win.png
deleted file mode 100644
index 593cfba..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_matrix@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_spread@win.png
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_spread@win.png b/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_spread@win.png
deleted file mode 100644
index 958a70b..0000000
Binary files a/mustella/tests/spark/core/fxg/properties/baselines/stroke_radial_gradient_stroke_radial_gradient_stroke_shape_spread@win.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/fxgtemplate_masks.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/fxgtemplate_masks.mxml b/mustella/tests/spark/core/fxg/properties/fxgtemplate_masks.mxml
index 8dfe90e..111c0e2 100644
--- a/mustella/tests/spark/core/fxg/properties/fxgtemplate_masks.mxml
+++ b/mustella/tests/spark/core/fxg/properties/fxgtemplate_masks.mxml
@@ -61,9 +61,7 @@
                  <RunCode code="application.grp.addElement(new clip_mask)" waitEvent="updateComplete" waitTarget="grp"/>
 	     </setup>
 	     <body>
-                 <CompareBitmap url="../properties/baselines/"  numColorVariances="8" maxColorVariance="14" target="grp">
-					 <ConditionalValue os="win"/>
-				</CompareBitmap>
+                 <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" maxColorVariance="14" target="grp" />
 	     </body>
 	</TestCase>
 	

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4f206356/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml b/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
index 0673319..8d3c3b3 100644
--- a/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
+++ b/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
@@ -554,9 +554,7 @@
                     <RunCode code="application.grp.addElement(new blend_difference_radialgradient_fill)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -596,9 +594,7 @@
                     <RunCode code="application.grp.addElement(new blend_layer_radialgradient_fill)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -622,9 +618,7 @@
                     <RunCode code="application.grp.addElement(new blend_multiply_radialgradient_fill)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -636,9 +630,7 @@
                     <RunCode code="application.grp.addElement(new blend_normal_radialgradient_fill)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -676,9 +668,7 @@
                     <RunCode code="application.grp.addElement(new blend_subtract_radialgradient_fill)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -714,9 +704,7 @@
                     <RunCode code="application.grp.addElement(new graphic_def)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -742,9 +730,7 @@
                     <RunCode code="application.grp.addElement(new library_def)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1026,9 +1012,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_fill_path_interpolation)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1040,9 +1024,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_fill_path_matrix)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1054,9 +1036,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_fill_path_spread)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1076,9 +1056,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_fill_shape_focal_point)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1090,9 +1068,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_fill_shape_interpolation)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1116,9 +1092,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_fill_shape_spread)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1178,9 +1152,7 @@
             <RunCode code="application.grp.addElement(new bevelfilter3)" waitEvent="updateComplete" waitTarget="grp"/>
         </setup>
         <body>
-            <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-				<ConditionalValue os="win"/>
-			</CompareBitmap>
+            <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
         </body>
     </TestCase> 
     <TestCase testID="filters_bevelfilter4" keywords="[fxg]" description="BitmapFill: distance,highlightAlpha,highlightColor,shadowAlpha,shadowColor,strength">
@@ -1255,9 +1227,7 @@
             <RunCode code="application.grp.addElement(new filters_group)" waitEvent="updateComplete" waitTarget="grp"/>
         </setup>
         <body>
-            <CompareBitmap url="../properties/baselines"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-				<ConditionalValue os="win"/>
-			</CompareBitmap>
+            <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
         </body>
     </TestCase>
         
@@ -1269,9 +1239,7 @@
             <RunCode code="application.grp.addElement(new filters_transform)" waitEvent="updateComplete" waitTarget="grp"/>
         </setup>
         <body>
-            <CompareBitmap url="../properties/baselines"  numColorVariances="16" ignoreMaxColorVariance="true"  target="grp">
-				<ConditionalValue os="win"/>
-			</CompareBitmap>
+            <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="16" ignoreMaxColorVariance="true"  target="grp" />
         </body>
     </TestCase>
         
@@ -1574,9 +1542,7 @@
                     <RunCode code="application.grp.addElement(new clip_mask)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -1872,9 +1838,7 @@
                     <RunCode code="application.grp.addElement(new shape_bmpgraphic_scalegridgroup)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2026,9 +1990,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_path_focal_point)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2040,9 +2002,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_path_interpolation)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2054,9 +2014,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_path_matrix)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2068,9 +2026,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_path_spread)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2082,9 +2038,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_shape_focal_point)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2096,9 +2050,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_shape_interpolation)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2110,9 +2062,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_shape_matrix)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>
         
@@ -2124,9 +2074,7 @@
                     <RunCode code="application.grp.addElement(new radial_gradient_stroke_shape_spread)" waitEvent="updateComplete" waitTarget="grp"/>
                 </setup>
                 <body>
-                    <CompareBitmap url="../properties/baselines/"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp">
-						<ConditionalValue os="win"/>
-					</CompareBitmap>
+                    <CompareBitmap url="../properties/baselines/$testID.png"  numColorVariances="8" ignoreMaxColorVariance="true"  target="grp" />
                 </body>
             </TestCase>