From 4d685c1b57b60dcfaed7b27d1d96fa499818f0ee Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Wed, 3 Aug 2011 09:55:28 +0000 Subject: [Mac] Add missing interface needed to land WebKit side of crbug.com/72727 Update PPAPI sandbox interface so we can land the WebKit side of this bug. The interface was updated as part of r87282 . BUG=72727 TEST=No way to test TBR=vtl Review URL: http://codereview.chromium.org/7564005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95228 0039d316-1c4b-4281-b951-d872f2087c98 --- content/ppapi_plugin/ppapi_webkitclient_impl.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'content/ppapi_plugin') diff --git a/content/ppapi_plugin/ppapi_webkitclient_impl.cc b/content/ppapi_plugin/ppapi_webkitclient_impl.cc index 366b49f..059e722 100644 --- a/content/ppapi_plugin/ppapi_webkitclient_impl.cc +++ b/content/ppapi_plugin/ppapi_webkitclient_impl.cc @@ -33,7 +33,10 @@ 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) virtual WebString getFontFamilyForCharacters( const WebUChar* characters, @@ -63,6 +66,7 @@ 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 @@ -71,6 +75,14 @@ bool PpapiWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont, return false; } +bool PpapiWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont, + ATSFontContainerRef* out, uint32_t* fontID) { + // TODO(brettw) this should do the something similar to what + // RendererWebKitClientImpl does and request that the browser load the font. + NOTIMPLEMENTED(); + return false; +} + #elif defined(OS_POSIX) WebString PpapiWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters( -- cgit v1.1