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/renderer | |
| 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/renderer')
| -rw-r--r-- | content/renderer/renderer_webkitplatformsupport_impl.cc | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 7028743..b4eb45f 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -119,11 +119,6 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport NSFont* src_font, CGFontRef* container, uint32* font_id); - // TODO(jeremy): Remove once http://webk.it/66935 lands. - virtual bool loadFont( - NSFont* src_font, - ATSFontContainerRef* out, - uint32_t* font_id); #elif defined(OS_POSIX) virtual WebKit::WebString getFontFamilyForCharacters( const WebKit::WebUChar* characters, @@ -482,35 +477,6 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont( return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } -// TODO(jeremy): Remove once http://webk.it/66935 lands. -bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont( - NSFont* src_font, ATSFontContainerRef* container, uint32* font_id) { - uint32 font_data_size; - FontDescriptor src_font_descriptor(src_font); - base::SharedMemoryHandle font_data; - if (!RenderThread::current()->Send(new ViewHostMsg_LoadFont( - src_font_descriptor, &font_data_size, &font_data, font_id))) { - *container = kATSFontContainerRefUnspecified; - *font_id = 0; - return false; - } - - if (font_data_size == 0 || font_data == base::SharedMemory::NULLHandle() || - *font_id == 0) { - NOTREACHED() << "Bad response from ViewHostMsg_LoadFont() for " << - src_font_descriptor.font_name; - *container = kATSFontContainerRefUnspecified; - *font_id = 0; - return false; - } - - // TODO(jeremy): Need to call back into WebKit to make sure that the font - // isn't already activated, based on the font id. If it's already - // activated, don't reactivate it here - crbug.com/72727 . - return FontLoader::ATSFontContainerFromBuffer(font_data, font_data_size, - container); -} - #elif defined(OS_POSIX) WebString |