summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 19:53:33 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 19:53:33 +0000
commit3c22b1893efad9bbe786bd5c25a7fbf499ac8e48 (patch)
treefde84179b3c1889e0a729ed4a83c2f57696acc64 /chrome/common
parent5951b5c1c74422be6793df444364f2f5436685ff (diff)
downloadchromium_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/common')
-rw-r--r--chrome/common/sandbox_methods_linux.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/common/sandbox_methods_linux.h b/chrome/common/sandbox_methods_linux.h
index 22fbf29..71c6883 100644
--- a/chrome/common/sandbox_methods_linux.h
+++ b/chrome/common/sandbox_methods_linux.h
@@ -15,6 +15,7 @@ class LinuxSandbox {
METHOD_GET_FONT_FAMILY_FOR_CHARS = 32,
METHOD_LOCALTIME = 33,
METHOD_GET_CHILD_WITH_INODE = 34,
+ METHOD_GET_STYLE_FOR_STRIKE = 35,
};
};