| commit | 7761c47340e015d3f56bb0ec02f55b085d5ae3d4 | [log] [tgz] |
|---|---|---|
| author | Dominik Röttsches <[email protected]> | Thu Sep 05 07:22:33 2019 |
| committer | Commit Bot <[email protected]> | Thu Sep 05 07:22:33 2019 |
| tree | e13721dd4f8074d1e23ea5171bb94d8150efabb3 | |
| parent | fab10fd81cf4e8681d5d9b172c204d61179ab6b9 [diff] [blame] |
Move and add DWriteFontLookupTableBuilder scheduling trigger DWriteFontLookupTableBuilder's font scanning was not configured with a path to cache the scanning results for content_shell. Add a ShellContentBrowserClient override to return the GetFontLookupTableCacheDir(), similarly as in GetNetworkContextsParentDirectory(). Move scheduling of font scanning to PreMainMessageLoopRun() after ShellBrowserMainParts has initialized a BrowserContext with a path. Required for ShellContentBrowserClient to return a valid lookup table cache directory. This fixes layout tests timing out on Windows 7 after [1] when they use src: local() in a @font-face declaration, and allows us to reland [1]. [1] https://chromium-review.googlesource.com/c/chromium/src/+/1769437 Bug: 998978 Change-Id: I844cd267a6da3b059a86c02580979c56107cbb55 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776358 Commit-Queue: Dominik Röttsches <[email protected]> Reviewed-by: Matt Falkenhagen <[email protected]> Reviewed-by: Etienne Bergeron <[email protected]> Reviewed-by: Gabriel Charette <[email protected]> Reviewed-by: François Doray <[email protected]> Cr-Commit-Position: refs/heads/master@{#693553}
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index 091b9e0..983b238 100644 --- a/content/shell/browser/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h
@@ -71,6 +71,7 @@ override; void OverrideWebkitPrefs(RenderViewHost* render_view_host, WebPreferences* prefs) override; + base::FilePath GetFontLookupTableCacheDir() override; DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; void OpenURL(SiteInstance* site_instance, const OpenURLParams& params,