| Index: content/renderer/renderer_webkitclient_impl.cc
|
| diff --git a/content/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc
|
| index da563d13f08f9d1edbba3a6d13d98562f6dcb86a..162e2a21a8afdbeae4f93da5140fcdf28079de39 100644
|
| --- a/content/renderer/renderer_webkitclient_impl.cc
|
| +++ b/content/renderer/renderer_webkitclient_impl.cc
|
| @@ -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);
|
|
|