Android content shell bringup.

content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
 
 #include <map>
 
 #include "base/synchronization/lock.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 #if defined(OS_WIN)
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/win/WebSandboxSupport.h"
 #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;
 using WebKit::WebString;
 using WebKit::WebUChar;
 
 typedef struct CGFont* CGFontRef;
 
 class PpapiWebKitPlatformSupportImpl::SandboxSupport : public WebSandboxSupport {
  public:
@@ skipping 39 matching lines @@
 bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
     NSFont* src_font,
     CGFontRef* out,
     uint32_t* font_id) {
   // TODO(brettw) this should do the something similar to what
   // RendererWebKitClientImpl does and request that the browser load the font.
   NOTIMPLEMENTED();
   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
 PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacters(
     const WebUChar* characters,
     size_t num_characters,
     const char* preferred_locale,
     WebKit::WebFontFamily* family) {
   base::AutoLock lock(unicode_font_families_mutex_);
   const string16 key(characters, num_characters);
   const std::map<string16, WebKit::WebFontFamily>::const_iterator iter =
       unicode_font_families_.find(key);
   if (iter != unicode_font_families_.end()) {
     family->name = iter->second.name;
     family->isBold = iter->second.isBold;
     family->isItalic = iter->second.isItalic;
     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
 
 PpapiWebKitPlatformSupportImpl::PpapiWebKitPlatformSupportImpl()
     : sandbox_support_(new PpapiWebKitPlatformSupportImpl::SandboxSupport()) {
 }
 
 PpapiWebKitPlatformSupportImpl::~PpapiWebKitPlatformSupportImpl() {
 }
@@ skipping 122 matching lines @@
 }
 
 WebKit::WebSerializedScriptValue
 PpapiWebKitPlatformSupportImpl::injectIDBKeyIntoSerializedValue(
     const WebKit::WebIDBKey& key,
     const WebKit::WebSerializedScriptValue& value,
     const WebKit::WebIDBKeyPath& keyPath) {
   NOTREACHED();
   return WebKit::WebSerializedScriptValue();
 }