[Mac] Remove old version of loadFont()

content/renderer/renderer_webkitclient_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_webkitclient_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/platform_file.h"
@@ skipping 97 matching lines @@
 };
 
 class RendererWebKitClientImpl::SandboxSupport
     : public WebKit::WebSandboxSupport {
  public:
   virtual ~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)
   virtual WebKit::WebString getFontFamilyForCharacters(
       const WebKit::WebUChar* characters,
       size_t numCharacters,
       const char* preferred_locale);
   virtual void getRenderStyleForStrike(
       const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out);
 
@@ skipping 303 matching lines @@
 #if defined(OS_WIN)
 
 bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
   return RenderThread::current()->Send(new ViewHostMsg_PreCacheFont(logfont));
 }
 
 #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);
   DCHECK(container);
   DCHECK(fontID);
 
   uint32 font_data_size;
   FontDescriptor src_font_descriptor(srcFont);
   base::SharedMemoryHandle font_data;
   if (!RenderThread::current()->Send(new ViewHostMsg_LoadFont(
@@ skipping 136 matching lines @@
 }
 
 //------------------------------------------------------------------------------
 
 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() {
   // RenderThread::current can be NULL when running some tests.
   if (!blob_registry_.get() && RenderThread::current())
     blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current()));
   return blob_registry_.get();
 }