| 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 | 9 |
| 10 #include "SkScalerContext.h" | 10 #include "SkScalerContext.h" |
| (...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 sk_bzero(mx, sizeof(*mx)); | 763 sk_bzero(mx, sizeof(*mx)); |
| 764 } | 764 } |
| 765 if (my) { | 765 if (my) { |
| 766 sk_bzero(my, sizeof(*my)); | 766 sk_bzero(my, sizeof(*my)); |
| 767 } | 767 } |
| 768 } | 768 } |
| 769 }; | 769 }; |
| 770 | 770 |
| 771 extern SkScalerContext* SkCreateColorScalerContext(const SkDescriptor* desc); | 771 extern SkScalerContext* SkCreateColorScalerContext(const SkDescriptor* desc); |
| 772 | 772 |
| 773 SkScalerContext* SkScalerContext::Create(const SkDescriptor* desc) { | 773 SkScalerContext* SkTypeface::createScalerContext(const SkDescriptor* desc) const
{ |
| 774 SkScalerContext* c = NULL; //SkCreateColorScalerContext(desc); | 774 SkScalerContext* c = NULL; //SkCreateColorScalerContext(desc); |
| 775 if (NULL == c) { | 775 if (NULL == c) { |
| 776 c = SkFontHost::CreateScalerContext(desc); | 776 c = this->onCreateScalerContext(desc); |
| 777 } | 777 } |
| 778 if (NULL == c) { | 778 if (NULL == c) { |
| 779 c = SkNEW_ARGS(SkScalerContext_Empty, (desc)); | 779 c = SkNEW_ARGS(SkScalerContext_Empty, (desc)); |
| 780 } | 780 } |
| 781 return c; | 781 return c; |
| 782 } | 782 } |
| 783 |
| 784 |
| OLD | NEW |