Revert 59111 - Added PDF resources to Chrome.

Added private interface to access resources from pepper plugin.
Added example to PDF srting resource.

BUG=54322
TEST=none


Review URL: http://codereview.chromium.org/3305029

TBR=gene@chromium.org
Review URL: http://codereview.chromium.org/3304019

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

27 files changed, 1 insertions, 128 deletions

diff --git a/webkit/glue/plugins/pepper_private.cc b/webkit/glue/plugins/pepper_private.cc
index b8f46cd..e88eb61 100644
--- a/webkit/glue/plugins/pepper_private.cc
+++ b/webkit/glue/plugins/pepper_private.cc
@@ -6,14 +6,9 @@
 
 #include "webkit/glue/plugins/pepper_private.h"
 
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
-#include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
-#include "skia/ext/platform_canvas.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/plugins/pepper_image_data.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
 #include "webkit/glue/plugins/pepper_var.h"
 #include "webkit/glue/plugins/ppb_private.h"
@@ -38,37 +33,6 @@ class PrivateFontFile : public Resource {
 };
 #endif
 
-static const struct {
-  PP_ResourceImage pp_id;
-  int res_id;
-} kResourceImageMap[] = {
-  { PP_RESOURCEIMAGE_PDF_BUTTON_FTH, IDR_PDF_BUTTON_FTH },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_FTH_HOVER, IDR_PDF_BUTTON_FTH_HOVER },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_FTH_PRESSED, IDR_PDF_BUTTON_FTH_PRESSED },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_FTW, IDR_PDF_BUTTON_FTW },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_FTW_HOVER, IDR_PDF_BUTTON_FTW_HOVER },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_FTW_PRESSED, IDR_PDF_BUTTON_FTW_PRESSED },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN, IDR_PDF_BUTTON_ZOOMIN },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_HOVER, IDR_PDF_BUTTON_ZOOMIN_HOVER },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_PRESSED, IDR_PDF_BUTTON_ZOOMIN_PRESSED },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMOUT, IDR_PDF_BUTTON_ZOOMOUT },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMOUT_HOVER, IDR_PDF_BUTTON_ZOOMOUT_HOVER },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMOUT_PRESSED,
-      IDR_PDF_BUTTON_ZOOMOUT_PRESSED },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_0, IDR_PDF_THUMBNAIL_0 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_1, IDR_PDF_THUMBNAIL_1 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_2, IDR_PDF_THUMBNAIL_2 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_3, IDR_PDF_THUMBNAIL_3 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_4, IDR_PDF_THUMBNAIL_4 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_5, IDR_PDF_THUMBNAIL_5 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_6, IDR_PDF_THUMBNAIL_6 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_7, IDR_PDF_THUMBNAIL_7 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_8, IDR_PDF_THUMBNAIL_8 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_9, IDR_PDF_THUMBNAIL_9 },
-  { PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_NUM_BACKGROUND,
-      IDR_PDF_THUMBNAIL_NUM_BACKGROUND },
-};
-
 namespace {
 
 PP_Var GetLocalizedString(PP_ResourceString string_id) {
@@ -79,43 +43,6 @@ PP_Var GetLocalizedString(PP_ResourceString string_id) {
   return StringToPPVar(rv);
 }
 
-PP_Resource GetResourceImage(PP_Module module_id, PP_ResourceImage image_id) {
-  int res_id = 0;
-  for (int i = 0; i < arraysize(kResourceImageMap); ++i) {
-    if (kResourceImageMap[i].pp_id == image_id) {
-      res_id = kResourceImageMap[i].res_id;
-      break;
-    }
-  }
-  if (res_id == 0)
-    return NULL;
-
-  SkBitmap* res_bitmap =
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(res_id);
-
-  PluginModule* module = PluginModule::FromPPModule(module_id);
-  if (!module)
-    return NULL;
-  scoped_refptr<pepper::ImageData> image_data(new pepper::ImageData(module));
-  if (!image_data->Init(PP_IMAGEDATAFORMAT_BGRA_PREMUL,
-                        res_bitmap->width(), res_bitmap->height(), false)) {
-    return NULL;
-  }
-
-  ImageDataAutoMapper mapper(image_data);
-  if (!mapper.is_valid())
-    return NULL;
-
-  skia::PlatformCanvas* canvas = image_data->mapped_canvas();
-  SkBitmap& ret_bitmap =
-      const_cast<SkBitmap&>(canvas->getTopPlatformDevice().accessBitmap(true));
-  if (!res_bitmap->copyTo(&ret_bitmap, SkBitmap::kARGB_8888_Config, NULL)) {
-    return NULL;
-  }
-
-  return image_data->GetReference();
-}
-
 PP_Resource GetFontFileWithFallback(
     PP_Module module_id,
     const PP_PrivateFontFileDescription* description) {
@@ -158,7 +85,6 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_file,
 
 const PPB_Private ppb_private = {
   &GetLocalizedString,
-  &GetResourceImage,
   &GetFontFileWithFallback,
   &GetFontTableForPrivateFontFile,
 };
diff --git a/webkit/glue/plugins/ppb_private.h b/webkit/glue/plugins/ppb_private.h
index 94c95bf..41ef0df 100644
--- a/webkit/glue/plugins/ppb_private.h
+++ b/webkit/glue/plugins/ppb_private.h
@@ -15,32 +15,6 @@ typedef enum {
 } PP_ResourceString;
 
 typedef enum {
-  PP_RESOURCEIMAGE_PDF_BUTTON_FTH = 0,
-  PP_RESOURCEIMAGE_PDF_BUTTON_FTH_HOVER = 1,
-  PP_RESOURCEIMAGE_PDF_BUTTON_FTH_PRESSED = 2,
-  PP_RESOURCEIMAGE_PDF_BUTTON_FTW = 3,
-  PP_RESOURCEIMAGE_PDF_BUTTON_FTW_HOVER = 4,
-  PP_RESOURCEIMAGE_PDF_BUTTON_FTW_PRESSED = 5,
-  PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN = 6,
-  PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_HOVER = 7,
-  PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_PRESSED = 8,
-  PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMOUT = 9,
-  PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMOUT_HOVER = 10,
-  PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMOUT_PRESSED = 11,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_0 = 12,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_1 = 13,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_2 = 14,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_3 = 15,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_4 = 16,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_5 = 17,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_6 = 18,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_7 = 19,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_8 = 20,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_9 = 21,
-  PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_NUM_BACKGROUND = 22,
-} PP_ResourceImage;
-
-typedef enum {
   PP_PRIVATEFONTPITCH_DEFAULT = 0,
   PP_PRIVATEFONTPITCH_FIXED = 1
 } PP_PrivateFontPitch;
@@ -86,10 +60,6 @@ struct PPB_Private {
   // Returns a localized string.
   PP_Var (*GetLocalizedString)(PP_ResourceString string_id);
 
-  // Returns a resource image.
-  PP_Resource (*GetResourceImage)(PP_Module module,
-                                  PP_ResourceImage image_id);
-
   // Returns a resource identifying a font file corresponding to the given font
   // request after applying the browser-specific fallback. Linux only.
   PP_Resource (*GetFontFileWithFallback)(
diff --git a/webkit/glue/resources/pdf_button_fth.png b/webkit/glue/resources/pdf_button_fth.png
deleted file mode 100644
index 3b2cc9b..0000000
--- a/webkit/glue/resources/pdf_button_fth.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_fth_hover.png b/webkit/glue/resources/pdf_button_fth_hover.png
deleted file mode 100644
index 2904fd7..0000000
--- a/webkit/glue/resources/pdf_button_fth_hover.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_fth_pressed.png b/webkit/glue/resources/pdf_button_fth_pressed.png
deleted file mode 100644
index 6388c3a..0000000
--- a/webkit/glue/resources/pdf_button_fth_pressed.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_ftw.png b/webkit/glue/resources/pdf_button_ftw.png
deleted file mode 100644
index d4dacc5..0000000
--- a/webkit/glue/resources/pdf_button_ftw.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_ftw_hover.png b/webkit/glue/resources/pdf_button_ftw_hover.png
deleted file mode 100644
index e5c98f4..0000000
--- a/webkit/glue/resources/pdf_button_ftw_hover.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_ftw_pressed.png b/webkit/glue/resources/pdf_button_ftw_pressed.png
deleted file mode 100644
index 8db22b7..0000000
--- a/webkit/glue/resources/pdf_button_ftw_pressed.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_zoomin.png b/webkit/glue/resources/pdf_button_zoomin.png
deleted file mode 100644
index 3d399c6..0000000
--- a/webkit/glue/resources/pdf_button_zoomin.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_zoomin_hover.png b/webkit/glue/resources/pdf_button_zoomin_hover.png
deleted file mode 100644
index 597f489..0000000
--- a/webkit/glue/resources/pdf_button_zoomin_hover.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_zoomin_pressed.png b/webkit/glue/resources/pdf_button_zoomin_pressed.png
deleted file mode 100644
index 7847808..0000000
--- a/webkit/glue/resources/pdf_button_zoomin_pressed.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_zoomout.png b/webkit/glue/resources/pdf_button_zoomout.png
deleted file mode 100644
index c1b7c7c9..0000000
--- a/webkit/glue/resources/pdf_button_zoomout.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_zoomout_hover.png b/webkit/glue/resources/pdf_button_zoomout_hover.png
deleted file mode 100644
index aa555cc..0000000
--- a/webkit/glue/resources/pdf_button_zoomout_hover.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_button_zoomout_pressed.png b/webkit/glue/resources/pdf_button_zoomout_pressed.png
deleted file mode 100644
index e16d8d6..0000000
--- a/webkit/glue/resources/pdf_button_zoomout_pressed.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_0.png b/webkit/glue/resources/pdf_thumbnail_0.png
deleted file mode 100644
index 0670def..0000000
--- a/webkit/glue/resources/pdf_thumbnail_0.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_1.png b/webkit/glue/resources/pdf_thumbnail_1.png
deleted file mode 100644
index 328ba75..0000000
--- a/webkit/glue/resources/pdf_thumbnail_1.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_2.png b/webkit/glue/resources/pdf_thumbnail_2.png
deleted file mode 100644
index 1c81dde..0000000
--- a/webkit/glue/resources/pdf_thumbnail_2.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_3.png b/webkit/glue/resources/pdf_thumbnail_3.png
deleted file mode 100644
index e46b856..0000000
--- a/webkit/glue/resources/pdf_thumbnail_3.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_4.png b/webkit/glue/resources/pdf_thumbnail_4.png
deleted file mode 100644
index 095c9ec..0000000
--- a/webkit/glue/resources/pdf_thumbnail_4.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_5.png b/webkit/glue/resources/pdf_thumbnail_5.png
deleted file mode 100644
index 2e55d49..0000000
--- a/webkit/glue/resources/pdf_thumbnail_5.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_6.png b/webkit/glue/resources/pdf_thumbnail_6.png
deleted file mode 100644
index c147854..0000000
--- a/webkit/glue/resources/pdf_thumbnail_6.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_7.png b/webkit/glue/resources/pdf_thumbnail_7.png
deleted file mode 100644
index 6db3919..0000000
--- a/webkit/glue/resources/pdf_thumbnail_7.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_8.png b/webkit/glue/resources/pdf_thumbnail_8.png
deleted file mode 100644
index 63f58db..0000000
--- a/webkit/glue/resources/pdf_thumbnail_8.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_9.png b/webkit/glue/resources/pdf_thumbnail_9.png
deleted file mode 100644
index 120ec7b..0000000
--- a/webkit/glue/resources/pdf_thumbnail_9.png
+++ /dev/null
diff --git a/webkit/glue/resources/pdf_thumbnail_num_background.png b/webkit/glue/resources/pdf_thumbnail_num_background.png
deleted file mode 100644
index ec22c24..0000000
--- a/webkit/glue/resources/pdf_thumbnail_num_background.png
+++ /dev/null
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 94d4286..8337d8e 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -53,29 +53,6 @@
       <include name="IDR_AUTOFILL_CC_MASTERCARD" file="resources\mastercard.png" type="BINDATA" />
       <include name="IDR_AUTOFILL_CC_SOLO" file="resources\solo.png" type="BINDATA" />
       <include name="IDR_AUTOFILL_CC_VISA" file="resources\visa.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_FTH" file="resources\pdf_button_fth.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_FTH_HOVER" file="resources\pdf_button_fth_hover.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_FTH_PRESSED" file="resources\pdf_button_fth_pressed.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_FTW" file="resources\pdf_button_ftw.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_FTW_HOVER" file="resources\pdf_button_ftw_hover.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_FTW_PRESSED" file="resources\pdf_button_ftw_pressed.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_ZOOMIN" file="resources\pdf_button_zoomin.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_ZOOMIN_HOVER" file="resources\pdf_button_zoomin_hover.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_ZOOMIN_PRESSED" file="resources\pdf_button_zoomin_pressed.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_ZOOMOUT" file="resources\pdf_button_zoomout.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_ZOOMOUT_HOVER" file="resources\pdf_button_zoomout_hover.png" type="BINDATA" />
-      <include name="IDR_PDF_BUTTON_ZOOMOUT_PRESSED" file="resources\pdf_button_zoomout_pressed.png" type="BINDATA" />      
-      <include name="IDR_PDF_THUMBNAIL_0" file="resources\pdf_thumbnail_0.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_1" file="resources\pdf_thumbnail_1.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_2" file="resources\pdf_thumbnail_2.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_3" file="resources\pdf_thumbnail_3.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_4" file="resources\pdf_thumbnail_4.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_5" file="resources\pdf_thumbnail_5.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_6" file="resources\pdf_thumbnail_6.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_7" file="resources\pdf_thumbnail_7.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_8" file="resources\pdf_thumbnail_8.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_9" file="resources\pdf_thumbnail_9.png" type="BINDATA" />
-      <include name="IDR_PDF_THUMBNAIL_NUM_BACKGROUND" file="resources\pdf_thumbnail_num_background.png" type="BINDATA" />
 
       <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'">
         <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd
index 3cc2a98..2d5e421 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/webkit/glue/webkit_strings.grd
@@ -368,7 +368,7 @@ below:
       </message>
 
       <message name="IDS_PDF_LOADING_PROGRESS" desc="A message displayed on the PDF control to indicate loading progress.">
-        Loading document: <ph name="PAGE_NUMBER">%d<ex>3</ex></ph>/<ph name="NUMBER_OF_PAGES">%d<ex>15</ex></ph> pages...
+        Loading document: %d/%d pages...
       </message>
     </messages>
   </release>