| Index: content/common/dwrite_font_platform_win.cc
|
| diff --git a/content/common/dwrite_font_platform_win.cc b/content/common/dwrite_font_platform_win.cc
|
| index da30d93d8fb91706860eda970988d9b67bacd24b..f2a9c2144651f2dbf471dbd05e28410eb3f855fc 100644
|
| --- a/content/common/dwrite_font_platform_win.cc
|
| +++ b/content/common/dwrite_font_platform_win.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/common/dwrite_font_platform_win.h"
|
| +#include "content/public/common/dwrite_font_platform_win.h"
|
|
|
| #include <dwrite.h>
|
| #include <map>
|
| @@ -33,7 +33,6 @@
|
| #include "base/win/registry.h"
|
| #include "base/win/scoped_comptr.h"
|
| #include "content/public/common/content_switches.h"
|
| -#include "content/public/common/dwrite_font_cache_win.h"
|
|
|
| namespace {
|
|
|
| @@ -1173,12 +1172,8 @@ bool LoadFontCache(const base::FilePath& path) {
|
| return true;
|
| }
|
|
|
| -// Assumption for this function is that it will get called through a posted task
|
| -// on FILE thread.
|
| -bool BuildAndLoadFontCache(const base::FilePath& file) {
|
| - if (BuildFontCacheInternal(file.value().c_str()))
|
| - return LoadFontCache(file);
|
| - return false;
|
| +bool BuildFontCache(const base::FilePath& file) {
|
| + return BuildFontCacheInternal(file.value().c_str());
|
| }
|
|
|
| } // namespace content
|
|
|