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

Unified Diff: content/test/layouttest_support.cc

Issue 1834763003: Remove font cache code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete message to build the font cache Created 4 years, 9 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: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index 2843fb8165e7cbe265b21ce22a67433733582119..cd110d03c26fa9428d56320d96c5a4e53f80b9e2 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -41,7 +41,6 @@
#include "content/browser/frame_host/popup_menu_helper_mac.h"
#elif defined(OS_WIN)
#include "content/child/font_warmup_win.h"
-#include "content/public/common/dwrite_font_platform_win.h"
#include "third_party/WebKit/public/web/win/WebFontRendering.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
#include "third_party/skia/include/ports/SkTypeface_win.h"
@@ -104,8 +103,6 @@ void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) {
i != files.end();
++i) {
SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
- if (!ShouldUseDirectWriteFontProxyFieldTrial())
- DoPreSandboxWarmupForTypeface(typeface);
blink::WebFontRendering::addSideloadedFontForTesting(typeface);
}
}
@@ -170,10 +167,7 @@ void EnableRendererLayoutTestMode() {
#if defined(OS_WIN)
if (gfx::win::ShouldUseDirectWrite()) {
- if (ShouldUseDirectWriteFontProxyFieldTrial())
- RegisterSideloadedTypefaces(SkFontMgr_New_DirectWrite());
- else
- RegisterSideloadedTypefaces(GetPreSandboxWarmupFontMgr());
+ RegisterSideloadedTypefaces(SkFontMgr_New_DirectWrite());
}
#endif
}

Powered by Google App Engine
This is Rietveld 408576698