Convert PDF to use SimpleImageData resource.

BUG=

Review URL: https://chromiumcodereview.appspot.com/16663010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206853 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 12 deletions

diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc
index 474cfd8..122b88c6 100644
--- a/ppapi/proxy/pdf_resource.cc
+++ b/ppapi/proxy/pdf_resource.cc
@@ -168,9 +168,8 @@ PP_Resource PDFResource::GetResourceImageForScale(PP_ResourceImage image_id,
 
   HostResource resource;
   PP_ImageDataDesc image_desc;
-  int fd;
   if (!UnpackMessage<PpapiPluginMsg_PDF_GetResourceImageReply>(
-      reply, &resource, &image_desc, &fd)) {
+      reply, &resource, &image_desc)) {
     return 0;
   }
 
@@ -179,19 +178,10 @@ PP_Resource PDFResource::GetResourceImageForScale(PP_ResourceImage image_id,
   if (!PPB_ImageData_Shared::IsImageDataDescValid(image_desc))
     return 0;
 
-#if defined(OS_ANDROID)
-  // This is compiled into android for tests only.
-  return 0;
-#elif defined(TOOLKIT_GTK)
-  return (new PlatformImageData(resource, image_desc, fd))->GetReference();
-#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
   base::SharedMemoryHandle handle;
   if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &handle))
     return 0;
-  return (new PlatformImageData(resource, image_desc, handle))->GetReference();
-#else
-#error Not implemented.
-#endif
+  return (new SimpleImageData(resource, image_desc, handle))->GetReference();
 }
 
 PP_Resource PDFResource::GetResourceImage(PP_ResourceImage image_id) {