Skip to content

Commit

Permalink
Removed unused functions in PPB_PDF
Browse files Browse the repository at this point in the history
There are a bunch of PPB_PDF functions that are now unused. Delete them.

BUG=303491

Review URL: https://codereview.chromium.org/1154313002

Cr-Commit-Position: refs/heads/master@{#331899}
  • Loading branch information
raymes authored and Commit bot committed May 29, 2015
1 parent a9fa362 commit b40097f
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 507 deletions.
2 changes: 0 additions & 2 deletions components/pdf.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
'pdf_common',
],
'sources': [
'pdf/renderer/pdf_resource_util.cc',
'pdf/renderer/pdf_resource_util.h',
'pdf/renderer/pepper_pdf_host.cc',
'pdf/renderer/pepper_pdf_host.h',
],
Expand Down
2 changes: 0 additions & 2 deletions components/pdf/renderer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import("//build/config/features.gni")

static_library("renderer") {
sources = [
"pdf_resource_util.cc",
"pdf_resource_util.h",
"pepper_pdf_host.cc",
"pepper_pdf_host.h",
]
Expand Down
35 changes: 0 additions & 35 deletions components/pdf/renderer/pdf_resource_util.cc

This file was deleted.

18 changes: 0 additions & 18 deletions components/pdf/renderer/pdf_resource_util.h

This file was deleted.

24 changes: 23 additions & 1 deletion components/pdf/renderer/pepper_pdf_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "components/pdf/renderer/pepper_pdf_host.h"

#include "components/pdf/common/pdf_messages.h"
#include "components/pdf/renderer/pdf_resource_util.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/common/referrer.h"
#include "content/public/renderer/pepper_plugin_instance.h"
#include "content/public/renderer/render_thread.h"
Expand All @@ -26,7 +26,9 @@
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/geometry/point.h"

namespace pdf {
Expand All @@ -38,6 +40,26 @@ namespace {
base::LazyInstance<base::ThreadLocalPointer<PepperPDFHost::PrintClient>>::Leaky
g_print_client_tls = LAZY_INSTANCE_INITIALIZER;

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 l10n_util::GetStringUTF8(resource_id);
}

} // namespace

PepperPDFHost::PepperPDFHost(content::RendererPpapiHost* host,
Expand Down
165 changes: 0 additions & 165 deletions ppapi/api/private/finish_writing_these/ppb_pdf.idl

This file was deleted.

69 changes: 0 additions & 69 deletions ppapi/c/private/ppb_pdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,55 +24,6 @@ typedef enum {
PP_RESOURCESTRING_PDFPROGRESSLOADING = 3
} PP_ResourceString;

typedef enum {
PP_RESOURCEIMAGE_PDF_BUTTON_FTP = 0,
PP_RESOURCEIMAGE_PDF_BUTTON_FTP_HOVER = 1,
PP_RESOURCEIMAGE_PDF_BUTTON_FTP_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_PDF_PROGRESS_BAR_0 = 23,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_1 = 24,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_2 = 25,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_3 = 26,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_4 = 27,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_5 = 28,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_6 = 29,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_7 = 30,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_8 = 31,
PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_BACKGROUND = 32,
PP_RESOURCEIMAGE_PDF_PAGE_DROPSHADOW = 33,
PP_RESOURCEIMAGE_PDF_BUTTON_SAVE = 34,
PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_HOVER = 35,
PP_RESOURCEIMAGE_PDF_BUTTON_SAVE_PRESSED = 36,
PP_RESOURCEIMAGE_PDF_BUTTON_PRINT = 37,
PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_HOVER = 38,
PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_PRESSED = 39,
PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END = 40,
PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_HOVER = 41,
PP_RESOURCEIMAGE_PDF_BUTTON_ZOOMIN_END_PRESSED = 42,
PP_RESOURCEIMAGE_PDF_PAN_SCROLL_ICON = 43,
PP_RESOURCEIMAGE_PDF_PAGE_INDICATOR_BACKGROUND = 44,
PP_RESOURCEIMAGE_PDF_BUTTON_PRINT_DISABLED = 45
} PP_ResourceImage;

typedef enum {
PP_PDFFEATURE_HIDPI = 0,
PP_PDFFEATURE_PRINTING = 1
Expand All @@ -94,10 +45,6 @@ struct PPB_PDF {
struct PP_Var (*GetLocalizedString)(PP_Instance instance,
PP_ResourceString string_id);

// Returns a resource image.
PP_Resource (*GetResourceImage)(PP_Instance instance,
PP_ResourceImage image_id);

// Returns a resource identifying a font file corresponding to the given font
// request after applying the browser-specific fallback.
//
Expand Down Expand Up @@ -134,9 +81,6 @@ struct PPB_PDF {
// The value is a bitfield of ContentRestriction enums.
void (*SetContentRestriction)(PP_Instance instance, int restrictions);

// Use UMA so we know average pdf page count.
void (*HistogramPDFPageCount)(PP_Instance instance, int count);

// Notifies the browser that the given action has been performed.
void (*UserMetricsRecordAction)(PP_Instance instance, struct PP_Var action);

Expand All @@ -151,19 +95,6 @@ struct PPB_PDF {

PP_Bool(*IsFeatureEnabled)(PP_Instance instance, PP_PDFFeature feature);

// Returns a resource image appropriate for a device with |scale| density.
// Returns 0 (NULL resource) if there is no resource at that scale
PP_Resource (*GetResourceImageForScale)(PP_Instance instance,
PP_ResourceImage image_id,
float scale);

// Invoke password dialog for plugin.
struct PP_Var (*ModalPromptForPassword)(PP_Instance instance,
struct PP_Var message);

// Returns PP_TRUE if the plugin is out of process.
PP_Bool (*IsOutOfProcess)(PP_Instance instance);

// Sets the selected text of the plugin.
void(*SetSelectedText)(PP_Instance instance, const char* selected_text);

Expand Down
Loading

0 comments on commit b40097f

Please sign in to comment.