| Index: trunk/src/core/SkScalerContext.cpp
|
| ===================================================================
|
| --- trunk/src/core/SkScalerContext.cpp (revision 8215)
|
| +++ trunk/src/core/SkScalerContext.cpp (working copy)
|
| @@ -770,13 +770,15 @@
|
|
|
| extern SkScalerContext* SkCreateColorScalerContext(const SkDescriptor* desc);
|
|
|
| -SkScalerContext* SkScalerContext::Create(const SkDescriptor* desc) {
|
| +SkScalerContext* SkTypeface::createScalerContext(const SkDescriptor* desc) const {
|
| SkScalerContext* c = NULL; //SkCreateColorScalerContext(desc);
|
| if (NULL == c) {
|
| - c = SkFontHost::CreateScalerContext(desc);
|
| + c = this->onCreateScalerContext(desc);
|
| }
|
| if (NULL == c) {
|
| c = SkNEW_ARGS(SkScalerContext_Empty, (desc));
|
| }
|
| return c;
|
| }
|
| +
|
| +
|
|
|