| OLD | NEW | 
|---|
| 1 |  | 
| 2 /* | 1 /* | 
| 3  * Copyright 2006 The Android Open Source Project | 2  * Copyright 2006 The Android Open Source Project | 
| 4  * | 3  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 7  */ | 6  */ | 
| 8 | 7 | 
| 9 #include "SkTypes.h"  // Keep this before any #ifdef ... | 8 #include "SkTypes.h"  // Keep this before any #ifdef ... | 
| 10 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) | 9 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) | 
| 11 | 10 | 
| (...skipping 2613 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2625         } | 2624         } | 
| 2626         return face; | 2625         return face; | 
| 2627     } | 2626     } | 
| 2628 }; | 2627 }; | 
| 2629 | 2628 | 
| 2630 /////////////////////////////////////////////////////////////////////////////// | 2629 /////////////////////////////////////////////////////////////////////////////// | 
| 2631 | 2630 | 
| 2632 SkFontMgr* SkFontMgr::Factory() { return new SkFontMgr_Mac; } | 2631 SkFontMgr* SkFontMgr::Factory() { return new SkFontMgr_Mac; } | 
| 2633 | 2632 | 
| 2634 #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) | 2633 #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) | 
| OLD | NEW | 
|---|