summaryrefslogtreecommitdiffstats
path: root/content/ppapi_plugin
diff options
context:
space:
mode:
Diffstat (limited to 'content/ppapi_plugin')
-rw-r--r--content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc33
1 files changed, 6 insertions, 27 deletions
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
index fe3b563..1a72ded 100644
--- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
+++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
@@ -19,14 +19,13 @@
#include "third_party/WebKit/public/platform/win/WebSandboxSupport.h"
#elif defined(OS_MACOSX)
#include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h"
+#elif defined(OS_ANDROID)
+#include "third_party/WebKit/public/platform/android/WebSandboxSupport.h"
#elif defined(OS_POSIX)
-#if !defined(OS_ANDROID)
#include "content/common/child_process_sandbox_support_impl_linux.h"
-#include "third_party/icu/source/common/unicode/utf16.h"
-#endif
#include "third_party/WebKit/public/platform/linux/WebFontFamily.h"
#include "third_party/WebKit/public/platform/linux/WebSandboxSupport.h"
-
+#include "third_party/icu/source/common/unicode/utf16.h"
#endif
using WebKit::WebSandboxSupport;
@@ -48,6 +47,8 @@ class PpapiWebKitPlatformSupportImpl::SandboxSupport
#elif defined(OS_MACOSX)
virtual bool loadFont(
NSFont* srcFont, CGFontRef* out, uint32_t* fontID);
+#elif defined(OS_ANDROID)
+ // Empty class.
#elif defined(OS_POSIX)
virtual void getFontFamilyForCharacters(
const WebKit::WebUChar* characters,
@@ -98,29 +99,7 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
#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::getFontFamilyForCharacter(
- WebUChar32* character,
- const char* preferred_locale,
- WebKit::WebFontFamily* family) {
- NOTIMPLEMENTED();
-}
-
-void PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
- const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) {
- NOTIMPLEMENTED();
-}
+// Empty class.
#elif defined(OS_POSIX)