diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 19:53:33 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 19:53:33 +0000 |
| commit | 3c22b1893efad9bbe786bd5c25a7fbf499ac8e48 (patch) | |
| tree | fde84179b3c1889e0a729ed4a83c2f57696acc64 /chrome/renderer/renderer_sandbox_support_linux.h | |
| parent | 5951b5c1c74422be6793df444364f2f5436685ff (diff) | |
| download | chromium_src-3c22b1893efad9bbe786bd5c25a7fbf499ac8e48.zip chromium_src-3c22b1893efad9bbe786bd5c25a7fbf499ac8e48.tar.gz chromium_src-3c22b1893efad9bbe786bd5c25a7fbf499ac8e48.tar.bz2 | |
WebKit roll 55080:55089
Also merging in this Chromium side patch to match:
Linux: add plumbing for fontconfig on per-strike basis
fontconfig on Linux can change the render preferences on a per strike
basis (a strike a combination of face and size). Because of this, we
need to query fontconfig each time a new FontPlatformData is created
for a new size.
This is the Chromium side of https://bugs.webkit.org/show_bug.cgi?id=33065
BUG=18159
TEST=A new renderer should respect settings in ~/.fonts.conf
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_sandbox_support_linux.h')
| -rw-r--r-- | chrome/renderer/renderer_sandbox_support_linux.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/renderer/renderer_sandbox_support_linux.h b/chrome/renderer/renderer_sandbox_support_linux.h index f8f080e..4ba5298 100644 --- a/chrome/renderer/renderer_sandbox_support_linux.h +++ b/chrome/renderer/renderer_sandbox_support_linux.h @@ -9,6 +9,10 @@ #include <string> +namespace WebKit { +struct WebFontRenderStyle; +} + namespace renderer_sandbox_support { // Return a font family which provides glyphs for the Unicode code points @@ -20,6 +24,9 @@ namespace renderer_sandbox_support { // satisfied. std::string getFontFamilyForCharacters(const uint16_t* utf16, size_t num_utf16); +void getRenderStyleForStrike(const char* family, int sizeAndStyle, + WebKit::WebFontRenderStyle* out); + }; // namespace render_sandbox_support #endif // CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_ |