Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: content/browser/browser_main_runner.cc

Issue 696913002: Retrieve font metrics from skia if DirectWrite is enabled for font metrics calculations in the chro… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build error Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/platform_font_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index e7381ae8ac12b82c7f535e57d02dcb4888bdd2f5..4a74b6eb5f828130b17bdead0497b5f4e13e14f2 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -20,6 +20,7 @@
#include "ui/base/ime/input_method_initializer.h"
#if defined(OS_WIN)
+#include <dwrite.h>
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "net/cert/sha256_legacy_support_win.h"
@@ -140,7 +141,7 @@ void MaybeEnableDirectWriteFontRendering() {
__uuidof(IDWriteFactory),
reinterpret_cast<IUnknown**>(&factory))));
SetDefaultSkiaFactory(SkFontMgr_New_DirectWrite(factory));
- gfx::PlatformFontWin::set_direct_write_factory(factory);
+ gfx::PlatformFontWin::set_use_skia_for_font_metrics(true);
}
}
« no previous file with comments | « no previous file | ui/gfx/platform_font_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698