| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 #ifdef SK_BUILD_FOR_MAC | 10 #ifdef SK_BUILD_FOR_MAC |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 AutoCFRelease<CGContextRef> fCG; | 337 AutoCFRelease<CGContextRef> fCG; |
| 338 SkISize fSize; | 338 SkISize fSize; |
| 339 bool fDoAA; | 339 bool fDoAA; |
| 340 bool fDoLCD; | 340 bool fDoLCD; |
| 341 | 341 |
| 342 static int RoundSize(int dimension) { | 342 static int RoundSize(int dimension) { |
| 343 return SkNextPow2(dimension); | 343 return SkNextPow2(dimension); |
| 344 } | 344 } |
| 345 }; | 345 }; |
| 346 | 346 |
| 347 Offscreen::Offscreen() : fRGBSpace(NULL), fCG(NULL) { | 347 Offscreen::Offscreen() : fRGBSpace(NULL), fCG(NULL), |
| 348 fDoAA(false), fDoLCD(false) { |
| 348 fSize.set(0, 0); | 349 fSize.set(0, 0); |
| 349 } | 350 } |
| 350 | 351 |
| 351 /////////////////////////////////////////////////////////////////////////////// | 352 /////////////////////////////////////////////////////////////////////////////// |
| 352 | 353 |
| 353 static SkTypeface::Style computeStyleBits(CTFontRef font, bool* isFixedPitch) { | 354 static SkTypeface::Style computeStyleBits(CTFontRef font, bool* isFixedPitch) { |
| 354 unsigned style = SkTypeface::kNormal; | 355 unsigned style = SkTypeface::kNormal; |
| 355 CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(font); | 356 CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(font); |
| 356 | 357 |
| 357 if (traits & kCTFontBoldTrait) { | 358 if (traits & kCTFontBoldTrait) { |
| (...skipping 1520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1878 return NULL; | 1879 return NULL; |
| 1879 } | 1880 } |
| 1880 return create_from_dataProvider(pr); | 1881 return create_from_dataProvider(pr); |
| 1881 } | 1882 } |
| 1882 }; | 1883 }; |
| 1883 | 1884 |
| 1884 SkFontMgr* SkFontMgr::Factory() { | 1885 SkFontMgr* SkFontMgr::Factory() { |
| 1885 return SkNEW(SkFontMgr_Mac); | 1886 return SkNEW(SkFontMgr_Mac); |
| 1886 } | 1887 } |
| 1887 #endif | 1888 #endif |
| OLD | NEW |