| Index: src/ports/SkFontMgr_win_dw_factory.cpp
|
| diff --git a/src/ports/SkFontHost_none.cpp b/src/ports/SkFontMgr_win_dw_factory.cpp
|
| similarity index 52%
|
| copy from src/ports/SkFontHost_none.cpp
|
| copy to src/ports/SkFontMgr_win_dw_factory.cpp
|
| index f76910d97ff1a9c25edd53ef9d632d9c39e88fd7..85ed56d695bd231008dc15fed3bb386b129b7b41 100644
|
| --- a/src/ports/SkFontHost_none.cpp
|
| +++ b/src/ports/SkFontMgr_win_dw_factory.cpp
|
| @@ -1,15 +1,13 @@
|
| -
|
| /*
|
| - * Copyright 2008 The Android Open Source Project
|
| + * Copyright 2015 Google Inc.
|
| *
|
| * Use of this source code is governed by a BSD-style license that can be
|
| * found in the LICENSE file.
|
| */
|
|
|
| #include "SkFontMgr.h"
|
| -#include "SkScalerContext.h"
|
| +#include "SkTypeface_win.h"
|
|
|
| SkFontMgr* SkFontMgr::Factory() {
|
| - // Always return NULL, an empty SkFontMgr will be used.
|
| - return NULL;
|
| + return SkFontMgr_New_DirectWrite();
|
| }
|
|
|