Index: content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc |
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc |
index 56ee6a584a29f4b0ad1d99259c77afcd7fe38df8..2f526fdf10b7d56a382c8a87da97a009a5f913f1 100644 |
--- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc |
+++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc |
@@ -20,9 +20,12 @@ |
#elif defined(OS_MACOSX) |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h" |
#elif defined(OS_POSIX) |
+#if !defined(OS_ANDROID) |
#include "content/common/child_process_sandbox_support_impl_linux.h" |
+#endif |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebSandboxSupport.h" |
+ |
#endif |
using WebKit::WebSandboxSupport; |
@@ -82,6 +85,24 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont( |
return false; |
} |
+#elif defined(OS_ANDROID) |
+ |
+// TODO(jrg): resolve (and implement?) PPAPI SandboxSupport for Android. |
+ |
+void |
+PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacters( |
+ const WebUChar* characters, |
+ size_t num_characters, |
+ const char* preferred_locale, |
+ WebKit::WebFontFamily* family) { |
+ NOTIMPLEMENTED(); |
+} |
+ |
+void PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike( |
+ const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) { |
+ NOTIMPLEMENTED(); |
+} |
+ |
#elif defined(OS_POSIX) |
void |