Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/ppb_pdf_proxy.cc

 // Copyright (c) 2011 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 "ppapi/proxy/ppb_pdf_proxy.h"
 
 #include <string.h>  // For memcpy.
 
 #include <map>
 
@@ skipping 100 matching lines @@
   return true;
 }
 
 const PPB_PDF pdf_interface = {
   NULL,  // &GetLocalizedString,
   NULL,  // &GetResourceImage,
   &GetFontFileWithFallback,
   &GetFontTableForPrivateFontFile,
 };
 
-InterfaceProxy* CreatePDFProxy(Dispatcher* dispatcher) {
-  return new PPB_PDF_Proxy(dispatcher);
+InterfaceProxy* CreatePDFProxy(Dispatcher* dispatcher,
+                              const void* target_interface) {
+  return new PPB_PDF_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-PPB_PDF_Proxy::PPB_PDF_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
-      ppb_pdf_impl_(NULL) {
-  if (!dispatcher->IsPlugin()) {
-    ppb_pdf_impl_ = static_cast<const PPB_PDF*>(
-        dispatcher->local_get_interface()(PPB_PDF_INTERFACE));
-  }
+PPB_PDF_Proxy::PPB_PDF_Proxy(Dispatcher* dispatcher,
+                             const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_PDF_Proxy::~PPB_PDF_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_PDF_Proxy::GetInfo() {
   static const Info info = {
     &pdf_interface,
     PPB_PDF_INTERFACE,
@@ skipping 18 matching lines @@
 }
 
 void PPB_PDF_Proxy::OnMsgGetFontFileWithFallback(
     PP_Instance instance,
     const SerializedFontDescription& in_desc,
     int32_t charset,
     HostResource* result) {
   PP_FontDescription_Dev desc;
   in_desc.SetToPPFontDescription(dispatcher(), &desc, false);
   result->SetHostResource(instance,
-      ppb_pdf_impl_->GetFontFileWithFallback(
+      ppb_pdf_target()->GetFontFileWithFallback(
           instance, &desc, static_cast<PP_PrivateFontCharset>(charset)));
 }
 
 void PPB_PDF_Proxy::OnMsgGetFontTableForPrivateFontFile(
     const HostResource& font_file,
     uint32_t table,
     std::string* result) {
   // TODO(brettw): It would be nice not to copy here. At least on Linux,
   // we can map the font file into shared memory and read it that way.
   uint32_t table_length = 0;
-  if (!ppb_pdf_impl_->GetFontTableForPrivateFontFile(
+  if (!ppb_pdf_target()->GetFontTableForPrivateFontFile(
           font_file.host_resource(), table, NULL, &table_length))
     return;
 
   result->resize(table_length);
-  ppb_pdf_impl_->GetFontTableForPrivateFontFile(font_file.host_resource(),
+  ppb_pdf_target()->GetFontTableForPrivateFontFile(font_file.host_resource(),
       table, const_cast<char*>(result->c_str()), &table_length);
 }
 
 }  // namespace proxy
 }  // namespace ppapi