flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1376161 - in /incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles: ./ Baselines/
Date Wed, 22 Aug 2012 18:05:41 GMT
Author: cframpton
Date: Wed Aug 22 18:05:40 2012
New Revision: 1376161

URL: http://svn.apache.org/viewvc?rev=1376161&view=rev
Log:
Fix tests/components/TextArea on Mac

Added:
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock_mac.png
  (with props)
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi_mac.png
  (with props)
Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontSize_127.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontSize_128.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/TextArea_Styles_ScrollControlBase.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock.png?rev=1376161&r1=1376160&r2=1376161&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock_mac.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock_mac.png?rev=1376161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Hancock_mac.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi.png?rev=1376161&r1=1376160&r2=1376161&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi_mac.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi_mac.png?rev=1376161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontFamily_Vivaldi_mac.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontSize_127.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontSize_127.png?rev=1376161&r1=1376160&r2=1376161&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontSize_128.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/Baselines/FontSize_128.png?rev=1376161&r1=1376160&r2=1376161&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/TextArea_Styles_ScrollControlBase.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/TextArea_Styles_ScrollControlBase.mxml?rev=1376161&r1=1376160&r2=1376161&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/TextArea_Styles_ScrollControlBase.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/TextArea/Styles/TextArea_Styles_ScrollControlBase.mxml
Wed Aug 22 18:05:40 2012
@@ -81,6 +81,8 @@
 			embedAsCFF: false;
         }
 
+/* These are Flash system fonts.  They can't be replaced with other fonts.
+   
         @font-face {
             src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Regular.ttf");
             fontFamily: "Hancock";
@@ -92,6 +94,7 @@
             fontFamily: "Vivaldi";
             fontAntiAliasType: "normal";
         }
+*/
     </mx:Style>
 
     <testCases>
@@ -301,7 +304,12 @@
                 <SetProperty target="ta1" propertyName="text" value="The quick, brown,
fox jumps over the lazy dog." waitEvent="updateComplete" waitTarget="ta1" />
             </setup>
             <body>
-                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Vivaldi.png"
/>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Vivaldi.png">
+                    <ConditionalValue os="win"/>
+                </CompareBitmap>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Vivaldi_mac.png">
+                    <ConditionalValue os="mac"/>
+                </CompareBitmap>
             </body>
         </TestCase>
 
@@ -313,7 +321,12 @@
                 <SetProperty target="ta1" propertyName="text" value="The quick, brown,
fox jumps over the lazy dog." waitEvent="updateComplete" waitTarget="ta1" />
             </setup>
             <body>
-                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Hancock.png"
/>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Hancock.png">
+                    <ConditionalValue os="win"/>
+                </CompareBitmap>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Hancock_mac.png">
+                    <ConditionalValue os="mac"/>
+                </CompareBitmap>
             </body>
 
         </TestCase>
@@ -324,11 +337,16 @@
                 <SetStyle target="ta1" styleName="fontAntiAliasType" value="normal" />
                 <SetStyle target="ta1" styleName="fontFamily" value="myArial" />
                 <SetProperty target="ta1" propertyName="text" value="The quick, brown,
fox jumps over the lazy dog." waitEvent="updateComplete" waitTarget="ta1" />
-                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Arial.png"
/>
-                <SetStyle target="ta1" styleName="fontFamily" value="Vivaldi" waitEvent="updateComplete"
waitTarget="ta1" />
             </setup>
             <body>
-                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Vivaldi.png"
/>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Arial.png"
/>
+                <SetStyle target="ta1" styleName="fontFamily" value="Vivaldi" waitEvent="updateComplete"
waitTarget="ta1" />
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Vivaldi.png">
+                    <ConditionalValue os="win"/>
+                </CompareBitmap>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Vivaldi_mac.png">
+                    <ConditionalValue os="mac"/>
+                </CompareBitmap>
             </body>
         </TestCase>
 
@@ -338,10 +356,15 @@
                 <SetStyle target="ta1" styleName="fontFamily" value="Hancock" />
                 <SetStyle target="ta1" styleName="fontAntiAliasType" value="normal" />
                 <SetProperty target="ta1" propertyName="text" value="The quick, brown,
fox jumps over the lazy dog." waitEvent="updateComplete" waitTarget="ta1" />
-                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Hancock.png"
/>
-                <SetStyle target="ta1" styleName="fontFamily" value="myArial" waitEvent="updateComplete"
waitTarget="ta1" />
             </setup>
             <body>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Hancock.png">
+                    <ConditionalValue os="win"/>
+                </CompareBitmap>
+                <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Hancock_mac.png">
+                    <ConditionalValue os="mac"/>
+                </CompareBitmap>
+                <SetStyle target="ta1" styleName="fontFamily" value="myArial" waitEvent="updateComplete"
waitTarget="ta1" />
                 <CompareBitmap target="ta1" url="../Styles/Baselines/FontFamily_Arial.png"
/>
             </body>
         </TestCase>
@@ -422,7 +445,7 @@
             <setup>
                 <ResetComponent target="ta1" className="mx.controls.TextArea" waitEvent="updateComplete"
waitTarget="ta1" />
                 <SetProperty target="ta1" propertyName="width" value="150" />
-                <SetProperty target="ta1" propertyName="height" value="150" />
+                <SetProperty target="ta1" propertyName="height" value="200" />
                 <SetProperty target="ta1" propertyName="text" value="The quick, brown,
fox jumps over the lazy dog." />
                 <SetStyle target="ta1" styleName="fontAntiAliasType" value="normal" />
                 <SetStyle target="ta1" styleName="fontSize" value="127" waitEvent="updateComplete"
/>
@@ -439,7 +462,7 @@
             <setup>
                 <ResetComponent target="ta1" className="mx.controls.TextArea" waitEvent="updateComplete"
waitTarget="ta1" />
                 <SetProperty target="ta1" propertyName="width" value="150" />
-                <SetProperty target="ta1" propertyName="height" value="150" />
+                <SetProperty target="ta1" propertyName="height" value="200" />
                 <SetProperty target="ta1" propertyName="text" value="The quick, brown,
fox jumps over the lazy dog." />
                 <SetStyle target="ta1" styleName="fontAntiAliasType" value="normal" />
                 <SetStyle target="ta1" styleName="fontSize" value="128" waitEvent="updateComplete"
/>



Mime
View raw message