Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8404 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index c5209ba..d204b13 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -429,7 +429,7 @@
{
SkASSERT(fontRef);
}
-
+
SkTypeface_Mac(const SkFontStyle& fs, SkFontID fontID, bool isFixedPitch,
CTFontRef fontRef, const char name[])
: SkTypeface(fontstyle2stylebits(fs), fontID, isFixedPitch)
@@ -439,7 +439,7 @@
{
SkASSERT(fontRef);
}
-
+
SkString fName;
AutoCFRelease<CTFontRef> fFontRef;
SkFontStyle fFontStyle;
@@ -1918,7 +1918,7 @@
if (!find_dict_float(dict, kCTFontSlantTrait, &slant)) {
slant = 0;
}
-
+
return SkFontStyle(unit_weight_to_fontstyle(weight),
unit_width_to_fontstyle(width),
slant ? SkFontStyle::kItalic_Slant
@@ -1932,14 +1932,14 @@
if (NULL == ctFont) {
return NULL;
}
-
+
SkString str;
CFStringToSkString(cfFamilyName, &str);
-
+
bool isFixedPitch;
(void)computeStyleBits(ctFont, &isFixedPitch);
SkFontID fontID = CTFontRef_to_SkFontID(ctFont);
-
+
return new SkTypeface_Mac(desc2fontstyle(desc), fontID, isFixedPitch,
ctFont, str.c_str());
}
@@ -1951,7 +1951,7 @@
, fFamilyName(familyName) {
CFRetain(familyName);
}
-
+
virtual ~SkFontStyleSet_Mac() {
CFSafeRelease(fArray);
CFRelease(fFamilyName);
@@ -1978,10 +1978,10 @@
virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
SkASSERT((unsigned)index < (unsigned)CFArrayGetCount(fArray));
CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index);
-
+
return createFromDesc(fFamilyName, desc);
}
-
+
private:
CFArrayRef fArray;
CFStringRef fFamilyName;
@@ -2035,10 +2035,10 @@
CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
&kCFTypeDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks));
-
+
CFDictionaryAddValue(cfAttr, kCTFontFamilyNameAttribute,
this->stringAt(index));
-
+
AutoCFRelease<CTFontDescriptorRef> desc(
CTFontDescriptorCreateWithAttributes(cfAttr));
return SkNEW_ARGS(SkFontStyleSet_Mac, (this->stringAt(index), desc));