Android content shell bringup.

content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc

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..3e638f211b50f0e8bc846b90bbc5a43dedbc0d2b 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,36 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
   return false;
 }
 
+// TODO(jeremy): Remove once http://webk.it/66935 lands.

[Yaron, 2012/05/09 01:01:42]

Why are you adding this to the mac section? Remove this part.

[John Grabowski, 2012/05/09 17:18:15]

You are absolutely right; removing from downstream.  

+bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
+    NSFont* src_font,
+    ATSFontContainerRef* out,
+    uint32_t* font_id) {
+  // TODO(brettw) this should do the something similar to what
+  // RendererWebKitPlatformSupportImpl does and request that the browser load
+  // the font.
+  NOTIMPLEMENTED();
+  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
@@ -101,17 +134,27 @@ PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacters(
     return;
   }
 
+#if defined(OS_ANDROID)

[Yaron, 2012/05/09 01:01:42]

Isn't this dead code? I think it's just bit-rot. With the if for ANDROID above,
this won't get evaluated.

+  // TODO(jrg): implement PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacters()
+  NOTIMPLEMENTED();
+#else
   content::GetFontFamilyForCharacters(
       characters,
       num_characters,
       preferred_locale,
       family);
   unicode_font_families_.insert(make_pair(key, *family));
+#endif
 }
 
 void PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
     const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) {
+#if defined(OS_ANDROID)

[Yaron, 2012/05/09 01:01:42]

same hedre. please remove

+  // TODO(jrg): implement PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike()
+  NOTIMPLEMENTED();
+#else
   content::GetRenderStyleForStrike(family, sizeAndStyle, out);
+#endif
 }
 
 #endif