add (temp) SkFontLCDConfig class to hold LCD getters/setters. This will allow

trunk/include/core/SkDeviceProperties.h

 #ifndef SkDeviceProperties_DEFINED
 #define SkDeviceProperties_DEFINED
 
 #ifndef SK_GAMMA_EXPONENT
     #define SK_GAMMA_EXPONENT (2.2f)
 #endif
 
 #ifdef SK_GAMMA_SRGB
     #undef SK_GAMMA_EXPONENT
     #define SK_GAMMA_EXPONENT (0.0f)
 #endif
 
-//TODO: get everyone to stop using SkFontHost::SetSubpixel* and remove this import.
-#include "SkFontHost.h"
+//TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and remove this import.
+#include "SkFontLCDConfig.h"
 
 struct SkDeviceProperties {
     struct Geometry {
         /** The orientation of the pixel specifies the interpretation of the
         *  layout. If the orientation is horizontal, the layout is interpreted as
         *  left to right. It the orientation is vertical, the layout is
         *  interpreted top to bottom (rotated 90deg cw from horizontal).
         */
         enum Orientation {
             kUnknown_Orientation      = 0x0,
@@ skipping 28 matching lines @@
         }
 
         bool isOrientationKnown() {
             return SkToBool(fGeometry & kKnown_Orientation);
         }
         bool isLayoutKnown() {
             return SkToBool(fGeometry & kKnown_Layout);
         }
 
     private:
-        //TODO: get everyone to stop using SkFontHost::SetSubpixel* and replace these calls with constants.
-        static Orientation fromOldOrientation(SkFontHost::LCDOrientation orientation) {
+        //TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and replace these calls with constants.
+        static Orientation fromOldOrientation(SkFontLCDConfig::LCDOrientation orientation) {
             switch (orientation) {
-            case SkFontHost::kHorizontal_LCDOrientation: return kHorizontal_Orientation;
-            case SkFontHost::kVertical_LCDOrientation: return kVertical_Orientation;
+            case SkFontLCDConfig::kHorizontal_LCDOrientation: return kHorizontal_Orientation;
+            case SkFontLCDConfig::kVertical_LCDOrientation: return kVertical_Orientation;
             default: return kUnknown_Orientation;
             }
         }
-        static Layout fromOldLayout(SkFontHost::LCDOrder order) {
+        static Layout fromOldLayout(SkFontLCDConfig::LCDOrder order) {
             switch (order) {
-            case SkFontHost::kRGB_LCDOrder: return kRGB_Layout;
-            case SkFontHost::kBGR_LCDOrder: return kBGR_Layout;
+            case SkFontLCDConfig::kRGB_LCDOrder: return kRGB_Layout;
+            case SkFontLCDConfig::kBGR_LCDOrder: return kBGR_Layout;
             default: return kUnknown_Layout;
             }
         }
     public:
         static Geometry MakeDefault() {
-            Orientation orientation = fromOldOrientation(SkFontHost::GetSubpixelOrientation()); //kHorizontal_Orientation
-            Layout layout = fromOldLayout(SkFontHost::GetSubpixelOrder()); //kRGB_Layout
+            Orientation orientation = fromOldOrientation(SkFontLCDConfig::GetSubpixelOrientation()); //kHorizontal_Orientation
+            Layout layout = fromOldLayout(SkFontLCDConfig::GetSubpixelOrder()); //kRGB_Layout
             Geometry ret = { SkToU8(orientation | layout) };
             return ret;
         }
 
         static Geometry Make(Orientation orientation, Layout layout) {
             Geometry ret = { SkToU8(orientation | layout) };
             return ret;
         }
 
         uint8_t fGeometry;
@@ skipping 11 matching lines @@
 
     /** Each pixel of an image will have some number of channels.
      *  Can the layout of those channels be exploited? */
     Geometry fGeometry;
 
     /** Represents the color space of the image. This is a woefully inadequate beginning. */
     SkScalar fGamma;
 };
 
 #endif