diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:50:47 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:50:47 +0000 |
| commit | e08255671738c597992f5067bc52eccf75f1afa1 (patch) | |
| tree | 53e9a332ca7a1b619dfce059a131361746339414 /content/ppapi_plugin | |
| parent | 6465bc3aea8a62f0598d5ea16e5efe8272f24dbf (diff) | |
| download | chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.zip chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.tar.gz chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.tar.bz2 | |
Android content shell bringup.
Build media java files (we weren't).
Fix adb_install_content_shell for cases where the app was stuck.
Add upstream staging gyp var / #define.
Be more consistent about jar output files (all in lib.java).
Upstream a bunch of random files (e.g. ppapi).
Upstream a bunch of java and native code hit as part of shlib init.
Properly package jar files in content shell.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10377059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc index 56ee6a5..2f526fd 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 |