summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_font_warmup_win.cc
diff options
context:
space:
mode:
authorraymes <raymes@chromium.org>2014-11-09 16:27:06 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-10 00:27:28 +0000
commit7ba10bcafcd5cb74990cbae13b2bf2b0ef4d1ab4 (patch)
treef747ee135c29bc207fbf2899b1f64e71c51bd2db /content/renderer/render_font_warmup_win.cc
parente42d0d199989109375bdcec46f776fe53b4ed000 (diff)
downloadchromium_src-7ba10bcafcd5cb74990cbae13b2bf2b0ef4d1ab4.zip
chromium_src-7ba10bcafcd5cb74990cbae13b2bf2b0ef4d1ab4.tar.gz
chromium_src-7ba10bcafcd5cb74990cbae13b2bf2b0ef4d1ab4.tar.bz2
Revert of DirectWrite Font Collection Cache Part 1 (patchset #5 id:80001 of https://codereview.chromium.org/693593004/)
Reason for revert: This broke content_unittests on an XP bot: https://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/33702/steps/content_unittests%20on%20Windows-5.1/logs/BuildCacheTest Original issue's description: > DirectWrite Font Collection Cache Part 1 > > This is the first phase of collection cache. This phase only integrates cache changes into existing DirectWrite font code, but doesn't actually trigger cache code. After this checkin there shouldn't be any changes in the way current loading scheme works during renderer startup. (Enumerate and load all fonts from registry during startup.) > > Why we need font cache? > Due to sandbox restrictions renderer cannot communicate to System Font Cache Service. With this CL we implement our own font cache service on browser side. This font cache services scope is limited to help with initial enumeration of all font files that are in the system. This will hopefully speedup renderer load time. Renderer currently loads all font files that are there in the system during initial enumeration. > > BUG=406659 > R=cpu,ananta,scottmg > > Committed: https://crrev.com/271f94c31cd6b94f27d481008afd43f652bbca7d > Cr-Commit-Position: refs/heads/master@{#303371} TBR=ananta@chromium.org,cpu@chromium.org,scottmg@chromium.org,shrikant@chromium.org NOTREECHECKS=true NOTRY=true BUG=406659 Review URL: https://codereview.chromium.org/678083005 Cr-Commit-Position: refs/heads/master@{#303410}
Diffstat (limited to 'content/renderer/render_font_warmup_win.cc')
-rw-r--r--content/renderer/render_font_warmup_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/render_font_warmup_win.cc b/content/renderer/render_font_warmup_win.cc
index b41923e..90bbab2 100644
--- a/content/renderer/render_font_warmup_win.cc
+++ b/content/renderer/render_font_warmup_win.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/win/iat_patch_function.h"
#include "base/win/windows_version.h"
-#include "content/common/dwrite_font_platform_win.h"
+#include "content/renderer/renderer_font_platform_win.h"
#include "third_party/WebKit/public/web/win/WebFontRendering.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/ports/SkFontMgr.h"