Commit cc626933 authored by jeremy@chromium.org's avatar jeremy@chromium.org

[Mac] Remove old version of loadFont()

Now that the API has changed in WebKit, we can safely remove the old version of loadFont() on the Chromium side.

BUG=72727
TEST=Chrome should compile.
TBR=mark


Review URL: http://codereview.chromium.org/7566038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95437 0039d316-1c4b-4281-b951-d872f2087c98
parent 4fb7be75
......@@ -33,8 +33,6 @@ class PpapiWebKitClientImpl::SandboxSupport : public WebSandboxSupport {
#if defined(OS_WIN)
virtual bool ensureFontLoaded(HFONT);
#elif defined(OS_MACOSX)
// TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
virtual bool loadFont(
NSFont* srcFont, ATSFontContainerRef* out, uint32_t* fontID);
#elif defined(OS_POSIX)
......@@ -66,15 +64,6 @@ bool PpapiWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
#elif defined(OS_MACOSX)
// TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
bool PpapiWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont,
ATSFontContainerRef* out) {
// TODO(brettw) this should do the something similar to what
// RendererWebKitClientImpl does and request that the browser load the font.
NOTIMPLEMENTED();
return false;
}
bool PpapiWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont,
ATSFontContainerRef* out, uint32_t* fontID) {
// TODO(brettw) this should do the something similar to what
......
......@@ -115,8 +115,6 @@ class RendererWebKitClientImpl::SandboxSupport
#if defined(OS_WIN)
virtual bool ensureFontLoaded(HFONT);
#elif defined(OS_MACOSX)
// TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
virtual bool loadFont(
NSFont* srcFont, ATSFontContainerRef* container, uint32* fontID);
#elif defined(OS_POSIX)
......@@ -440,13 +438,6 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
#elif defined(OS_MACOSX)
// TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
bool RendererWebKitClientImpl::SandboxSupport::loadFont(
NSFont* srcFont, ATSFontContainerRef* out) {
uint32 temp;
return loadFont(srcFont, out, &temp);
}
bool RendererWebKitClientImpl::SandboxSupport::loadFont(
NSFont* srcFont, ATSFontContainerRef* container, uint32* fontID) {
DCHECK(srcFont);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment