summaryrefslogtreecommitdiffstats
path: root/components/pdf
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@chromium.org>2014-09-02 00:13:40 -0400
committerSadrul Habib Chowdhury <sadrul@chromium.org>2014-09-02 04:16:48 +0000
commit8a0003bc269cfaabb44ce2db04046eb7a26bd78e (patch)
treeb6ea6e30ffe928d154761cf9386ddcc792d53711 /components/pdf
parent42262e32c0437b10bf7c7915f574fcc81f882453 (diff)
downloadchromium_src-8a0003bc269cfaabb44ce2db04046eb7a26bd78e.zip
chromium_src-8a0003bc269cfaabb44ce2db04046eb7a26bd78e.tar.gz
chromium_src-8a0003bc269cfaabb44ce2db04046eb7a26bd78e.tar.bz2
pdf: Move the string/image resources for the pdf plugin.
Move the resources for the pdf plugin out of //content into //components. Also, reuse the same code for getting the resource from PepperPDFHost and PPB_PDF_Impl. BUG=401242 R=blundell@chromium.org, jam@chromium.org, raymes@chromium.org Review URL: https://codereview.chromium.org/506473003 Cr-Commit-Position: refs/heads/master@{#292897}
Diffstat (limited to 'components/pdf')
-rw-r--r--components/pdf/DEPS2
-rw-r--r--components/pdf/renderer/BUILD.gn4
-rw-r--r--components/pdf/renderer/DEPS2
-rw-r--r--components/pdf/renderer/pdf_resource_util.cc113
-rw-r--r--components/pdf/renderer/pdf_resource_util.h24
-rw-r--r--components/pdf/renderer/pepper_pdf_host.cc97
-rw-r--r--components/pdf/renderer/ppb_pdf_impl.cc93
7 files changed, 149 insertions, 186 deletions
diff --git a/components/pdf/DEPS b/components/pdf/DEPS
index 745ee50..d0c3033 100644
--- a/components/pdf/DEPS
+++ b/components/pdf/DEPS
@@ -1,7 +1,5 @@
include_rules = [
- "+content/app",
"+content/public",
- "+grit/webkit_resources.h",
"+ipc",
"+ppapi",
"+third_party/skia/include",
diff --git a/components/pdf/renderer/BUILD.gn b/components/pdf/renderer/BUILD.gn
index f072d26..3e0fbc7 100644
--- a/components/pdf/renderer/BUILD.gn
+++ b/components/pdf/renderer/BUILD.gn
@@ -8,6 +8,8 @@ static_library("renderer") {
sources = [
"pepper_pdf_host.cc",
"pepper_pdf_host.h",
+ "pdf_resource_util.cc",
+ "pdf_resource_util.h",
"ppb_pdf_impl.cc",
"ppb_pdf_impl.h",
]
@@ -15,6 +17,8 @@ static_library("renderer") {
deps = [
"//base",
"//components/pdf/common",
+ "//components/resources:components_resources",
+ "//components/strings",
"//content/public/renderer",
"//ppapi:ppapi_shared",
"//third_party/icu",
diff --git a/components/pdf/renderer/DEPS b/components/pdf/renderer/DEPS
index b4762c10..ee0d845 100644
--- a/components/pdf/renderer/DEPS
+++ b/components/pdf/renderer/DEPS
@@ -1,4 +1,6 @@
include_rules = [
+ "+components/strings/grit/components_strings.h",
+ "+grit/component_scaled_resources.h",
"+skia/ext",
"+ui/gfx",
]
diff --git a/components/pdf/renderer/pdf_resource_util.cc b/components/pdf/renderer/pdf_resource_util.cc
new file mode 100644
index 0000000..4a3a9fd
--- /dev/null
+++ b/components/pdf/renderer/pdf_resource_util.cc
@@ -0,0 +1,113 @@
+// Copyright 2014 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 "components/pdf/renderer/pdf_resource_util.h"
+
+#include "base/strings/utf_string_conversions.h"
+#include "components/strings/grit/components_strings.h"
+#include "grit/component_scaled_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+
+namespace {
+
+struct ResourceImageInfo {
+ PP_ResourceImage pp_id;
+ int res_id;
+};
+
+static const ResourceImageInfo kResourceImageMap[] = {
+ {PP_RESOURCEIMAGE_PDF_BUTTON_FTP, IDR_PDF_BUTTON_FTP},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_FTP_HOVER, IDR_PDF_BUTTON_FTP_HOVER},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_FTP_PRESSED, IDR_PDF_BUTTON_FTP_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_END, IDR_PDF_BUTTON_ZOOMIN_END},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_HOVER,
+ IDR_PDF_BUTTON_ZOOMIN_END_HOVER},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_PRESSED,
+ IDR_PDF_BUTTON_ZOOMIN_END_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_SAVE, IDR_PDF_BUTTON_SAVE},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_HOVER, IDR_PDF_BUTTON_SAVE_HOVER},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_PRESSED, IDR_PDF_BUTTON_SAVE_PRESSED},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT, IDR_PDF_BUTTON_PRINT},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_HOVER, IDR_PDF_BUTTON_PRINT_HOVER},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_PRESSED, IDR_PDF_BUTTON_PRINT_PRESSED},
+ {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED, IDR_PDF_BUTTON_PRINT_DISABLED},
+ {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},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_0, IDR_PDF_PROGRESS_BAR_0},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_1, IDR_PDF_PROGRESS_BAR_1},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_2, IDR_PDF_PROGRESS_BAR_2},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_3, IDR_PDF_PROGRESS_BAR_3},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_4, IDR_PDF_PROGRESS_BAR_4},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_5, IDR_PDF_PROGRESS_BAR_5},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_6, IDR_PDF_PROGRESS_BAR_6},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_7, IDR_PDF_PROGRESS_BAR_7},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_8, IDR_PDF_PROGRESS_BAR_8},
+ {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_BACKGROUND,
+ IDR_PDF_PROGRESS_BAR_BACKGROUND},
+ {PP_RESOURCEIMAGE_PDF_PAGE_INDICATOR_BACKGROUND,
+ IDR_PDF_PAGE_INDICATOR_BACKGROUND},
+ {PP_RESOURCEIMAGE_PDF_PAGE_DROPSHADOW, IDR_PDF_PAGE_DROPSHADOW},
+ {PP_RESOURCEIMAGE_PDF_PAN_SCROLL_ICON, IDR_PDF_PAN_SCROLL_ICON},
+};
+
+} // namespace
+
+namespace pdf {
+
+gfx::ImageSkia* GetImageResource(PP_ResourceImage image_id) {
+ int resource_id = 0;
+ for (size_t i = 0; i < arraysize(kResourceImageMap); ++i) {
+ if (kResourceImageMap[i].pp_id == image_id) {
+ resource_id = kResourceImageMap[i].res_id;
+ break;
+ }
+ }
+
+ return resource_id ? ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+ resource_id)
+ : NULL;
+}
+
+std::string GetStringResource(PP_ResourceString string_id) {
+ int resource_id = 0;
+ switch (string_id) {
+ case PP_RESOURCESTRING_PDFGETPASSWORD:
+ resource_id = IDS_PDF_NEED_PASSWORD;
+ break;
+ case PP_RESOURCESTRING_PDFLOADING:
+ resource_id = IDS_PDF_PAGE_LOADING;
+ break;
+ case PP_RESOURCESTRING_PDFLOAD_FAILED:
+ resource_id = IDS_PDF_PAGE_LOAD_FAILED;
+ break;
+ case PP_RESOURCESTRING_PDFPROGRESSLOADING:
+ resource_id = IDS_PDF_PROGRESS_LOADING;
+ break;
+ }
+
+ return base::UTF16ToUTF8(l10n_util::GetStringUTF16(resource_id));
+}
+
+} // namespace pdf
diff --git a/components/pdf/renderer/pdf_resource_util.h b/components/pdf/renderer/pdf_resource_util.h
new file mode 100644
index 0000000..aab8a1c
--- /dev/null
+++ b/components/pdf/renderer/pdf_resource_util.h
@@ -0,0 +1,24 @@
+// Copyright 2014 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.
+
+#ifndef COMPONENTS_PDF_RENDERER_PDF_RESOURCE_UTIL_H_
+#define COMPONENTS_PDF_RENDERER_PDF_RESOURCE_UTIL_H_
+
+#include <string>
+
+#include "ppapi/c/private/ppb_pdf.h"
+
+namespace gfx {
+class ImageSkia;
+}
+
+namespace pdf {
+
+gfx::ImageSkia* GetImageResource(PP_ResourceImage image_id);
+
+std::string GetStringResource(PP_ResourceString string_id);
+
+} // namespace pdf
+
+#endif // COMPONENTS_PDF_RENDERER_PDF_RESOURCE_UTIL_H_
diff --git a/components/pdf/renderer/pepper_pdf_host.cc b/components/pdf/renderer/pepper_pdf_host.cc
index c720ca8..301e56f 100644
--- a/components/pdf/renderer/pepper_pdf_host.cc
+++ b/components/pdf/renderer/pepper_pdf_host.cc
@@ -4,11 +4,9 @@
#include "components/pdf/renderer/pepper_pdf_host.h"
-#include "base/strings/utf_string_conversions.h"
#include "components/pdf/common/pdf_messages.h"
+#include "components/pdf/renderer/pdf_resource_util.h"
#include "components/pdf/renderer/ppb_pdf_impl.h"
-#include "content/app/resources/grit/content_resources.h"
-#include "content/app/strings/grit/content_strings.h"
#include "content/public/common/referrer.h"
#include "content/public/renderer/pepper_plugin_instance.h"
#include "content/public/renderer/render_thread.h"
@@ -31,76 +29,11 @@
#include "third_party/WebKit/public/web/WebPluginContainer.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/point.h"
-namespace {
-
-struct ResourceImageInfo {
- PP_ResourceImage pp_id;
- int res_id;
-};
-
-const ResourceImageInfo kResourceImageMap[] = {
- {PP_RESOURCEIMAGE_PDF_BUTTON_FTP, IDR_PDF_BUTTON_FTP},
- {PP_RESOURCEIMAGE_PDF_BUTTON_FTP_HOVER, IDR_PDF_BUTTON_FTP_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_FTP_PRESSED, IDR_PDF_BUTTON_FTP_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_END, IDR_PDF_BUTTON_ZOOMIN_END},
- {PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_HOVER,
- IDR_PDF_BUTTON_ZOOMIN_END_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_PRESSED,
- IDR_PDF_BUTTON_ZOOMIN_END_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_SAVE, IDR_PDF_BUTTON_SAVE},
- {PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_HOVER, IDR_PDF_BUTTON_SAVE_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_PRESSED, IDR_PDF_BUTTON_SAVE_PRESSED},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT, IDR_PDF_BUTTON_PRINT},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_HOVER, IDR_PDF_BUTTON_PRINT_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_PRESSED, IDR_PDF_BUTTON_PRINT_PRESSED},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED, IDR_PDF_BUTTON_PRINT_DISABLED},
- {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},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_0, IDR_PDF_PROGRESS_BAR_0},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_1, IDR_PDF_PROGRESS_BAR_1},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_2, IDR_PDF_PROGRESS_BAR_2},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_3, IDR_PDF_PROGRESS_BAR_3},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_4, IDR_PDF_PROGRESS_BAR_4},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_5, IDR_PDF_PROGRESS_BAR_5},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_6, IDR_PDF_PROGRESS_BAR_6},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_7, IDR_PDF_PROGRESS_BAR_7},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_8, IDR_PDF_PROGRESS_BAR_8},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_BACKGROUND,
- IDR_PDF_PROGRESS_BAR_BACKGROUND},
- {PP_RESOURCEIMAGE_PDF_PAGE_INDICATOR_BACKGROUND,
- IDR_PDF_PAGE_INDICATOR_BACKGROUND},
- {PP_RESOURCEIMAGE_PDF_PAGE_DROPSHADOW, IDR_PDF_PAGE_DROPSHADOW},
- {PP_RESOURCEIMAGE_PDF_PAN_SCROLL_ICON, IDR_PAN_SCROLL_ICON}, };
-
-} // namespace
-
namespace pdf {
PepperPDFHost::PepperPDFHost(content::RendererPpapiHost* host,
@@ -141,20 +74,7 @@ int32_t PepperPDFHost::OnResourceMessageReceived(
int32_t PepperPDFHost::OnHostMsgGetLocalizedString(
ppapi::host::HostMessageContext* context,
PP_ResourceString string_id) {
- std::string rv;
- if (string_id == PP_RESOURCESTRING_PDFGETPASSWORD) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_NEED_PASSWORD));
- } else if (string_id == PP_RESOURCESTRING_PDFLOADING) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PAGE_LOADING));
- } else if (string_id == PP_RESOURCESTRING_PDFLOAD_FAILED) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PAGE_LOAD_FAILED));
- } else if (string_id == PP_RESOURCESTRING_PDFPROGRESSLOADING) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PROGRESS_LOADING));
- } else {
- NOTREACHED();
- return PP_ERROR_FAILED;
- }
-
+ std::string rv = GetStringResource(string_id);
context->reply_msg = PpapiPluginMsg_PDF_GetLocalizedStringReply(rv);
return PP_OK;
}
@@ -242,18 +162,7 @@ int32_t PepperPDFHost::OnHostMsgGetResourceImage(
ppapi::host::HostMessageContext* context,
PP_ResourceImage image_id,
float scale) {
- int res_id = 0;
- for (size_t 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 PP_ERROR_FAILED;
-
- gfx::ImageSkia* res_image_skia =
- ResourceBundle::GetSharedInstance().GetImageSkiaNamed(res_id);
+ gfx::ImageSkia* res_image_skia = GetImageResource(image_id);
if (!res_image_skia)
return PP_ERROR_FAILED;
diff --git a/components/pdf/renderer/ppb_pdf_impl.cc b/components/pdf/renderer/ppb_pdf_impl.cc
index a26c740..abfc7f8 100644
--- a/components/pdf/renderer/ppb_pdf_impl.cc
+++ b/components/pdf/renderer/ppb_pdf_impl.cc
@@ -7,11 +7,9 @@
#include "base/files/scoped_file.h"
#include "base/metrics/histogram.h"
#include "base/numerics/safe_conversions.h"
-#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "components/pdf/common/pdf_messages.h"
-#include "content/app/resources/grit/content_resources.h"
-#include "content/app/strings/grit/content_strings.h"
+#include "components/pdf/renderer/pdf_resource_util.h"
#include "content/public/common/child_process_sandbox_support_linux.h"
#include "content/public/common/referrer.h"
#include "content/public/renderer/pepper_plugin_instance.h"
@@ -31,8 +29,6 @@
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/icu/source/i18n/unicode/usearch.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
namespace pdf {
namespace {
@@ -64,66 +60,6 @@ class PrivateFontFile : public ppapi::Resource {
};
#endif
-struct ResourceImageInfo {
- PP_ResourceImage pp_id;
- int res_id;
-};
-
-static const ResourceImageInfo kResourceImageMap[] = {
- {PP_RESOURCEIMAGE_PDF_BUTTON_FTP, IDR_PDF_BUTTON_FTP},
- {PP_RESOURCEIMAGE_PDF_BUTTON_FTP_HOVER, IDR_PDF_BUTTON_FTP_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_FTP_PRESSED, IDR_PDF_BUTTON_FTP_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_END, IDR_PDF_BUTTON_ZOOMIN_END},
- {PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_HOVER,
- IDR_PDF_BUTTON_ZOOMIN_END_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_PRESSED,
- IDR_PDF_BUTTON_ZOOMIN_END_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_SAVE, IDR_PDF_BUTTON_SAVE},
- {PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_HOVER, IDR_PDF_BUTTON_SAVE_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_PRESSED, IDR_PDF_BUTTON_SAVE_PRESSED},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT, IDR_PDF_BUTTON_PRINT},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_HOVER, IDR_PDF_BUTTON_PRINT_HOVER},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_PRESSED, IDR_PDF_BUTTON_PRINT_PRESSED},
- {PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED, IDR_PDF_BUTTON_PRINT_DISABLED},
- {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},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_0, IDR_PDF_PROGRESS_BAR_0},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_1, IDR_PDF_PROGRESS_BAR_1},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_2, IDR_PDF_PROGRESS_BAR_2},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_3, IDR_PDF_PROGRESS_BAR_3},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_4, IDR_PDF_PROGRESS_BAR_4},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_5, IDR_PDF_PROGRESS_BAR_5},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_6, IDR_PDF_PROGRESS_BAR_6},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_7, IDR_PDF_PROGRESS_BAR_7},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_8, IDR_PDF_PROGRESS_BAR_8},
- {PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_BACKGROUND,
- IDR_PDF_PROGRESS_BAR_BACKGROUND},
- {PP_RESOURCEIMAGE_PDF_PAGE_INDICATOR_BACKGROUND,
- IDR_PDF_PAGE_INDICATOR_BACKGROUND},
- {PP_RESOURCEIMAGE_PDF_PAGE_DROPSHADOW, IDR_PDF_PAGE_DROPSHADOW},
- {PP_RESOURCEIMAGE_PDF_PAN_SCROLL_ICON, IDR_PAN_SCROLL_ICON},
-};
-
PP_Var GetLocalizedString(PP_Instance instance_id,
PP_ResourceString string_id) {
content::PepperPluginInstance* instance =
@@ -131,19 +67,7 @@ PP_Var GetLocalizedString(PP_Instance instance_id,
if (!instance)
return PP_MakeUndefined();
- std::string rv;
- if (string_id == PP_RESOURCESTRING_PDFGETPASSWORD) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_NEED_PASSWORD));
- } else if (string_id == PP_RESOURCESTRING_PDFLOADING) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PAGE_LOADING));
- } else if (string_id == PP_RESOURCESTRING_PDFLOAD_FAILED) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PAGE_LOAD_FAILED));
- } else if (string_id == PP_RESOURCESTRING_PDFPROGRESSLOADING) {
- rv = base::UTF16ToUTF8(l10n_util::GetStringUTF16(IDS_PDF_PROGRESS_LOADING));
- } else {
- NOTREACHED();
- }
-
+ std::string rv = GetStringResource(string_id);
return ppapi::StringVar::StringToPPVar(rv);
}
@@ -341,24 +265,13 @@ PP_Bool IsFeatureEnabled(PP_Instance instance, PP_PDFFeature feature) {
PP_Resource GetResourceImageForScale(PP_Instance instance_id,
PP_ResourceImage image_id,
float scale) {
- int res_id = 0;
- for (size_t 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 0;
-
// Validate the instance.
content::PepperPluginInstance* instance =
content::PepperPluginInstance::Get(instance_id);
if (!instance)
return 0;
- gfx::ImageSkia* res_image_skia =
- ResourceBundle::GetSharedInstance().GetImageSkiaNamed(res_id);
+ gfx::ImageSkia* res_image_skia = GetImageResource(image_id);
if (!res_image_skia)
return 0;