diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 09:29:52 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 09:29:52 +0000 |
| commit | ac82d73b018d3a3ef7f1b518419f1a0b38c48809 (patch) | |
| tree | aff607d1aa221828fdad4cb70fa8faea20a11140 /content/common/mac | |
| parent | a466fdec662a25c18b8e4f1178fb2c726bca0bd5 (diff) | |
| download | chromium_src-ac82d73b018d3a3ef7f1b518419f1a0b38c48809.zip chromium_src-ac82d73b018d3a3ef7f1b518419f1a0b38c48809.tar.gz chromium_src-ac82d73b018d3a3ef7f1b518419f1a0b38c48809.tar.bz2 | |
Suppression for failing test on Linux
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7885024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/mac')
| -rw-r--r-- | content/common/mac/font_loader.h | 6 | ||||
| -rw-r--r-- | content/common/mac/font_loader.mm | 28 |
2 files changed, 0 insertions, 34 deletions
diff --git a/content/common/mac/font_loader.h b/content/common/mac/font_loader.h index 7cd6682..17f63e1 100644 --- a/content/common/mac/font_loader.h +++ b/content/common/mac/font_loader.h @@ -52,12 +52,6 @@ class FontLoader { static bool CGFontRefFromBuffer(base::SharedMemoryHandle font_data, uint32 font_data_size, CGFontRef* out); - - - // TODO(jeremy): Remove once http://webk.it/66935 lands. - static bool ATSFontContainerFromBuffer(base::SharedMemoryHandle font_data, - uint32 font_data_size, - ATSFontContainerRef* font_container); }; #endif // CONTENT_COMMON_MAC_FONT_LOADER_H_ diff --git a/content/common/mac/font_loader.mm b/content/common/mac/font_loader.mm index 93eb03f..e62a861 100644 --- a/content/common/mac/font_loader.mm +++ b/content/common/mac/font_loader.mm @@ -164,31 +164,3 @@ bool FontLoader::CGFontRefFromBuffer(base::SharedMemoryHandle font_data, return true; } - -// TODO(jeremy): Remove once http://webk.it/66935 lands. -// static -bool FontLoader::ATSFontContainerFromBuffer(base::SharedMemoryHandle font_data, - uint32 font_data_size, - ATSFontContainerRef* font_container) -{ - CHECK(font_container); - - using base::SharedMemory; - DCHECK(SharedMemory::IsHandleValid(font_data)); - DCHECK_GT(font_data_size, 0U); - - SharedMemory shm(font_data, true); - if (!shm.Map(font_data_size)) - return false; - - // A value of 3 means the font is private and can't be seen by anyone else. - // This is the value used by WebKit when activating remote fonts. - const ATSFontContext kFontContextPrivate = 3; - OSStatus err = ATSFontActivateFromMemory(shm.memory(), font_data_size, - kFontContextPrivate, kATSFontFormatUnspecified, NULL, - kATSOptionFlagsDefault, font_container); - if (err != noErr || !font_container) - return false; - - return true; -} |