Remove attempted bug mitigation in Mac typeface.

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 "SkTypes.h"  // Keep this before any #ifdef ...
 
@@ skipping 879 matching lines @@
         context.getVerticalOffset(glyphID, &offset);
         subX += offset.fX;
         subY += offset.fY;
     }
 
     CGPoint point = CGPointMake(-glyph.fLeft + subX, glyph.fTop + glyph.fHeight - subY);
     // Prior to 10.10, CTFontDrawGlyphs acted like CGContextShowGlyphsAtPositions and took
     // 'positions' which are in text space. The glyph location (in device space) must be
     // mapped into text space, so that CG can convert it back into device space.
     // In 10.10.1, this is handled directly in CTFontDrawGlyphs.
-
+    //
     // However, in 10.10.2 color glyphs no longer rotate based on the font transform.
     // So always make the font transform identity and place the transform on the context.
     point = CGPointApplyAffineTransform(point, context.fInvTransform);
 
-    // Attempt to keep on the stack a hard reference to the font tables.
-    // This is an experiment to see if this affects crbug.com/413332 .
-    // When 10.6 headers are no longer supported, 'sbix' can be replaced with kCTFontTableSbix.
-    AutoCFRelease<CFDataRef> sbix;
-    if (static_cast<SkTypeface_Mac*>(context.getTypeface())->fHasColorGlyphs) {
-        sbix.reset(CGFontCopyTableForTag(context.fCGFont, 'sbix'));
-        // Attempt to read from the sbix table data to determine if the returned data is valid.
-        const UInt8* sbixData = CFDataGetBytePtr(sbix);
-        CFIndex sbixLength = CFDataGetLength(sbix);
-        if (sbixLength > 0 && *sbixData > 0x80) {
-            // We need to actually do something to avoid this being optimized away.
-            CFRetain(sbix);
-            CFRelease(sbix);
-        }
-    }
     ctFontDrawGlyphs(context.fCTUnrotatedFont, &glyphID, &point, 1, fCG);
 
     SkASSERT(rowBytesPtr);
     *rowBytesPtr = rowBytes;
     return image;
 }
 
 void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkPoint* offset) const {
     // Snow Leopard returns cgVertOffset in completely un-transformed FUnits (em space, y up).
     // Lion and Leopard return cgVertOffset in CG units (pixels, y up).
@@ skipping 1550 matching lines @@
         }
         return face;
     }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkNEW(SkFontMgr_Mac);
 }