Skip to content

GitLab

T
tangled
Commit 8a0003bc authored by Sadrul Habib Chowdhury's avatar Sadrul Habib Chowdhury
Browse files
Options

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}
parent 42262e32
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 249 deletions
components/components_strings.grd
View file @ 8a0003bc
...@@ -172,6 +172,7 @@ ...@@ -172,6 +172,7 @@
<part file="dom_distiller_strings.grdp" /> <part file="dom_distiller_strings.grdp" />
<part file="google_strings.grdp" /> <part file="google_strings.grdp" />
<part file="omnibox_strings.grdp" /> <part file="omnibox_strings.grdp" />
<part file="pdf_strings.grdp" />
<part file="policy_strings.grdp" /> <part file="policy_strings.grdp" />
<part file="translate_strings.grdp" /> <part file="translate_strings.grdp" />
</messages> </messages>
......
components/pdf.gypi
View file @ 8a0003bc
...@@ -43,11 +43,15 @@ ...@@ -43,11 +43,15 @@
'<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
'components_resources.gyp:components_resources',
'components_strings.gyp:components_strings',
'pdf_common', 'pdf_common',
], ],
'sources': [ 'sources': [
'pdf/renderer/pepper_pdf_host.cc', 'pdf/renderer/pepper_pdf_host.cc',
'pdf/renderer/pepper_pdf_host.h', 'pdf/renderer/pepper_pdf_host.h',
'pdf/renderer/pdf_resource_util.cc',
'pdf/renderer/pdf_resource_util.h',
'pdf/renderer/ppb_pdf_impl.cc', 'pdf/renderer/ppb_pdf_impl.cc',
'pdf/renderer/ppb_pdf_impl.h', 'pdf/renderer/ppb_pdf_impl.h',
], ],
......
components/pdf/DEPS
View file @ 8a0003bc
include_rules = [ include_rules = [
"+content/app",
"+content/public", "+content/public",
"+grit/webkit_resources.h",
"+ipc", "+ipc",
"+ppapi", "+ppapi",
"+third_party/skia/include", "+third_party/skia/include",
......
components/pdf/renderer/BUILD.gn
View file @ 8a0003bc
...@@ -8,6 +8,8 @@ static_library("renderer") { ...@@ -8,6 +8,8 @@ static_library("renderer") {
sources = [ sources = [
"pepper_pdf_host.cc", "pepper_pdf_host.cc",
"pepper_pdf_host.h", "pepper_pdf_host.h",
"pdf_resource_util.cc",
"pdf_resource_util.h",
"ppb_pdf_impl.cc", "ppb_pdf_impl.cc",
"ppb_pdf_impl.h", "ppb_pdf_impl.h",
] ]
...@@ -15,6 +17,8 @@ static_library("renderer") { ...@@ -15,6 +17,8 @@ static_library("renderer") {
deps = [ deps = [
"//base", "//base",
"//components/pdf/common", "//components/pdf/common",
"//components/resources:components_resources",
"//components/strings",
"//content/public/renderer", "//content/public/renderer",
"//ppapi:ppapi_shared", "//ppapi:ppapi_shared",
"//third_party/icu", "//third_party/icu",
......
components/pdf/renderer/DEPS
View file @ 8a0003bc
include_rules = [ include_rules = [
"+components/strings/grit/components_strings.h",
"+grit/component_scaled_resources.h",
"+skia/ext", "+skia/ext",
"+ui/gfx", "+ui/gfx",
] ]
components/pdf/renderer/pdf_resource_util.cc 0 → 100644
View file @ 8a0003bc
// 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
components/pdf/renderer/pdf_resource_util.h 0 → 100644
View file @ 8a0003bc
// 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_
components/pdf/renderer/pepper_pdf_host.cc
View file @ 8a0003bc
...@@ -4,11 +4,9 @@ ...@@ -4,11 +4,9 @@
#include "components/pdf/renderer/pepper_pdf_host.h" #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/common/pdf_messages.h"
#include "components/pdf/renderer/pdf_resource_util.h"
#include "components/pdf/renderer/ppb_pdf_impl.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/common/referrer.h"
#include "content/public/renderer/pepper_plugin_instance.h" #include "content/public/renderer/pepper_plugin_instance.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
...@@ -31,76 +29,11 @@ ...@@ -31,76 +29,11 @@
#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "third_party/WebKit/public/web/WebPluginContainer.h"
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.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.h"
#include "ui/gfx/image/image_skia_rep.h" #include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/point.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 { namespace pdf {
PepperPDFHost::PepperPDFHost(content::RendererPpapiHost* host, PepperPDFHost::PepperPDFHost(content::RendererPpapiHost* host,
...@@ -141,20 +74,7 @@ int32_t PepperPDFHost::OnResourceMessageReceived( ...@@ -141,20 +74,7 @@ int32_t PepperPDFHost::OnResourceMessageReceived(
int32_t PepperPDFHost::OnHostMsgGetLocalizedString( int32_t PepperPDFHost::OnHostMsgGetLocalizedString(
ppapi::host::HostMessageContext* context, ppapi::host::HostMessageContext* context,
PP_ResourceString string_id) { PP_ResourceString string_id) {
std::string rv; std::string rv = GetStringResource(string_id);
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;
}
context->reply_msg = PpapiPluginMsg_PDF_GetLocalizedStringReply(rv); context->reply_msg = PpapiPluginMsg_PDF_GetLocalizedStringReply(rv);
return PP_OK; return PP_OK;
} }
...@@ -242,18 +162,7 @@ int32_t PepperPDFHost::OnHostMsgGetResourceImage( ...@@ -242,18 +162,7 @@ int32_t PepperPDFHost::OnHostMsgGetResourceImage(
ppapi::host::HostMessageContext* context, ppapi::host::HostMessageContext* context,
PP_ResourceImage image_id, PP_ResourceImage image_id,
float scale) { float scale) {
int res_id = 0; gfx::ImageSkia* res_image_skia = GetImageResource(image_id);
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);
if (!res_image_skia) if (!res_image_skia)
return PP_ERROR_FAILED; return PP_ERROR_FAILED;
......
components/pdf/renderer/ppb_pdf_impl.cc
View file @ 8a0003bc
...@@ -7,11 +7,9 @@ ...@@ -7,11 +7,9 @@
#include "base/files/scoped_file.h" #include "base/files/scoped_file.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/numerics/safe_conversions.h" #include "base/numerics/safe_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/pdf/common/pdf_messages.h" #include "components/pdf/common/pdf_messages.h"
#include "content/app/resources/grit/content_resources.h" #include "components/pdf/renderer/pdf_resource_util.h"
#include "content/app/strings/grit/content_strings.h"
#include "content/public/common/child_process_sandbox_support_linux.h" #include "content/public/common/child_process_sandbox_support_linux.h"
#include "content/public/common/referrer.h" #include "content/public/common/referrer.h"
#include "content/public/renderer/pepper_plugin_instance.h" #include "content/public/renderer/pepper_plugin_instance.h"
...@@ -31,8 +29,6 @@ ...@@ -31,8 +29,6 @@
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "third_party/icu/source/i18n/unicode/usearch.h" #include "third_party/icu/source/i18n/unicode/usearch.h"
#include "third_party/skia/include/core/SkBitmap.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 pdf {
namespace { namespace {
...@@ -64,66 +60,6 @@ class PrivateFontFile : public ppapi::Resource { ...@@ -64,66 +60,6 @@ class PrivateFontFile : public ppapi::Resource {
}; };
#endif #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_Var GetLocalizedString(PP_Instance instance_id,
PP_ResourceString string_id) { PP_ResourceString string_id) {
content::PepperPluginInstance* instance = content::PepperPluginInstance* instance =
...@@ -131,19 +67,7 @@ PP_Var GetLocalizedString(PP_Instance instance_id, ...@@ -131,19 +67,7 @@ PP_Var GetLocalizedString(PP_Instance instance_id,
if (!instance) if (!instance)
return PP_MakeUndefined(); return PP_MakeUndefined();
std::string rv; std::string rv = GetStringResource(string_id);
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 ppapi::StringVar::StringToPPVar(rv); return ppapi::StringVar::StringToPPVar(rv);
} }
...@@ -341,24 +265,13 @@ PP_Bool IsFeatureEnabled(PP_Instance instance, PP_PDFFeature feature) { ...@@ -341,24 +265,13 @@ PP_Bool IsFeatureEnabled(PP_Instance instance, PP_PDFFeature feature) {
PP_Resource GetResourceImageForScale(PP_Instance instance_id, PP_Resource GetResourceImageForScale(PP_Instance instance_id,
PP_ResourceImage image_id, PP_ResourceImage image_id,
float scale) { 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. // Validate the instance.
content::PepperPluginInstance* instance = content::PepperPluginInstance* instance =
content::PepperPluginInstance::Get(instance_id); content::PepperPluginInstance::Get(instance_id);
if (!instance) if (!instance)
return 0; return 0;
gfx::ImageSkia* res_image_skia = gfx::ImageSkia* res_image_skia = GetImageResource(image_id);
ResourceBundle::GetSharedInstance().GetImageSkiaNamed(res_id);
if (!res_image_skia) if (!res_image_skia)
return 0; return 0;
......
components/pdf_strings.grdp 0 → 100644
View file @ 8a0003bc
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<if expr="enable_plugins">
<message name="IDS_PDF_NEED_PASSWORD" desc="A message asking the user for a password to open a PDF file.">
This document is password protected. Please enter a password.
</message>
<message name="IDS_PDF_PAGE_LOADING" desc="A message displayed on the PDF page while page is loading.">
Loading...
</message>
<message name="IDS_PDF_PAGE_LOAD_FAILED" desc="A message displayed on the PDF control to indicate that the PDF document failed to load.">
Failed to load PDF document
</message>
<message name="IDS_PDF_PROGRESS_LOADING" desc="A message displayed on the progress control over PDF page during document loading.">
Loading
</message>
</if>
</grit-part>
components/resources/components_scaled_resources.grd
View file @ 8a0003bc
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<structures fallback_to_low_resolution="true"> <structures fallback_to_low_resolution="true">
<part file="autofill_scaled_resources.grdp" /> <part file="autofill_scaled_resources.grdp" />
<part file="omnibox_scaled_resources.grdp" /> <part file="omnibox_scaled_resources.grdp" />
<part file="pdf_scaled_resources.grdp" />
</structures> </structures>
</release> </release>
</grit> </grit>
components/resources/pdf_scaled_resources.grdp 0 → 100644
View file @ 8a0003bc
This diff is collapsed.
content/app/resources/content_resources.grd
View file @ 8a0003bc
This diff is collapsed.
content/app/strings/content_strings.grd
View file @ 8a0003bc
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment