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

Unified Diff: third_party/WebKit/Source/web/linux/WebFontRendering.cpp

Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@windows_change
Patch Set: Rebase. Created 4 years, 10 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
Index: third_party/WebKit/Source/web/linux/WebFontRendering.cpp
diff --git a/third_party/WebKit/Source/web/linux/WebFontRendering.cpp b/third_party/WebKit/Source/web/linux/WebFontRendering.cpp
index 621ff44ff9068862aee7bee9814be55a8efcaf1b..63b21a3a5a4852496c5beaec261ba7ff1d172e35 100644
--- a/third_party/WebKit/Source/web/linux/WebFontRendering.cpp
+++ b/third_party/WebKit/Source/web/linux/WebFontRendering.cpp
@@ -31,6 +31,7 @@
#include "public/web/linux/WebFontRendering.h"
#include "core/layout/LayoutThemeFontProvider.h"
+#include "platform/fonts/FontCache.h"
#include "platform/fonts/FontDescription.h"
#include "platform/fonts/FontPlatformData.h"
@@ -40,6 +41,13 @@ using blink::FontPlatformData;
namespace blink {
// static
+void WebFontRendering::setSkiaFontManager(SkFontMgr* fontMgr)
+{
+ WTF::adopted(fontMgr);
+ FontCache::setFontManager(RefPtr<SkFontMgr>(fontMgr));
+}
+
+// static
void WebFontRendering::setHinting(SkPaint::Hinting hinting)
{
FontPlatformData::setHinting(hinting);

Powered by Google App Engine
This is Rietveld 408576698