summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/pepper_private.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 17:50:13 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 17:50:13 +0000
commit5b23a5b85c0f8294cf5032552a52cc56cd323a43 (patch)
tree8a58d426496be958a70efe5e3f22db80bac209f4 /webkit/glue/plugins/pepper_private.cc
parente932f077ac1794b19e10318cf81049b3b63df2a7 (diff)
downloadchromium_src-5b23a5b85c0f8294cf5032552a52cc56cd323a43.zip
chromium_src-5b23a5b85c0f8294cf5032552a52cc56cd323a43.tar.gz
chromium_src-5b23a5b85c0f8294cf5032552a52cc56cd323a43.tar.bz2
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
Diffstat (limited to 'webkit/glue/plugins/pepper_private.cc')
-rw-r--r--webkit/glue/plugins/pepper_private.cc74
1 files changed, 0 insertions, 74 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,
};