Mask orientation and layout correctly.

src/ports/SkFontHost_mac.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <vector>
 #ifdef SK_BUILD_FOR_MAC
@@ skipping 1814 matching lines @@
         memcpy(dstData, CFDataGetBytePtr(srcData) + offset, length);
     }
     return length;
 }
 
 SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc) const {
     return new SkScalerContext_Mac(const_cast<SkTypeface_Mac*>(this), desc);
 }
 
 void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const {
-    unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag |
-                                  SkScalerContext::kAutohinting_Flag;
+    if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag ||
+        rec->fFlags & SkScalerContext::kLCD_Vertical_Flag)
+    {
+        rec->fMaskFormat = SkMask::kA8_Format;
+        rec->setHinting(SkPaint::kNormal_Hinting);

[reed1, 2013/05/06 18:02:12]

why do we explicitly set hinting in this case?

[bungeman-skia, 2013/05/06 18:16:10]

Added comment. The issue is that LCD no-hinting means LCD with-dilation, whereas
A8 no-hinting means A8 no-dilation. Setting the hinting to 'normal' here means
that the A8 generated will be A8 with-dilation, the closest possible match to
the LCD we would have otherwise drawn.

+    }
+    
+    unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag  |
+                                  SkScalerContext::kAutohinting_Flag  |
+                                  SkScalerContext::kLCD_BGROrder_Flag |
+                                  SkScalerContext::kLCD_Vertical_Flag;
 
     rec->fFlags &= ~flagsWeDontSupport;
 
     bool lcdSupport = supports_LCD();
 
     // Only two levels of hinting are supported.
     // kNo_Hinting means avoid CoreGraphics outline dilation.
     // kNormal_Hinting means CoreGraphics outline dilation is allowed.
     // If there is no lcd support, hinting (dilation) cannot be supported.
     SkPaint::Hinting hinting = rec->getHinting();
@@ skipping 361 matching lines @@
             return NULL;
         }
         return create_from_dataProvider(pr);
     }
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkNEW(SkFontMgr_Mac);
 }
 #endif