Skip to content

Commit

Permalink
ppapi: Fix nits in some PDF API code.
Browse files Browse the repository at this point in the history
- Mark parameters const for SetAccessibilityViewportInfo() and
  SetAccessibilityDocInfo().
- Fix lint errors.

Change-Id: I2d54ac4e4b04acb20b7b86767534b30bfba8541e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1794502
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697217}
  • Loading branch information
leizleiz authored and Commit Bot committed Sep 17, 2019
1 parent 704275a commit b5cdb38
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 15 deletions.
4 changes: 2 additions & 2 deletions ppapi/c/private/ppb_pdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ struct PPB_PDF {
// support.
void (*SetAccessibilityViewportInfo)(
PP_Instance instance,
struct PP_PrivateAccessibilityViewportInfo* viewport_info);
const struct PP_PrivateAccessibilityViewportInfo* viewport_info);

// Sends information about the PDF document to the renderer for accessibility
// support.
void (*SetAccessibilityDocInfo)(
PP_Instance instance,
struct PP_PrivateAccessibilityDocInfo* doc_info);
const struct PP_PrivateAccessibilityDocInfo* doc_info);

// Sends information about one page in a PDF document to the renderer for
// accessibility support.
Expand Down
7 changes: 4 additions & 3 deletions ppapi/cpp/private/pdf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,17 @@ void PDF::GetV8ExternalSnapshotData(const InstanceHandle& instance,
// static
void PDF::SetAccessibilityViewportInfo(
const InstanceHandle& instance,
PP_PrivateAccessibilityViewportInfo* viewport_info) {
const PP_PrivateAccessibilityViewportInfo* viewport_info) {
if (has_interface<PPB_PDF>()) {
get_interface<PPB_PDF>()->SetAccessibilityViewportInfo(
instance.pp_instance(), viewport_info);
}
}

// static
void PDF::SetAccessibilityDocInfo(const InstanceHandle& instance,
PP_PrivateAccessibilityDocInfo* doc_info) {
void PDF::SetAccessibilityDocInfo(
const InstanceHandle& instance,
const PP_PrivateAccessibilityDocInfo* doc_info) {
if (has_interface<PPB_PDF>()) {
get_interface<PPB_PDF>()->SetAccessibilityDocInfo(instance.pp_instance(),
doc_info);
Expand Down
4 changes: 2 additions & 2 deletions ppapi/cpp/private/pdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ class PDF {
int* snapshot_size_out);
static void SetAccessibilityViewportInfo(
const InstanceHandle& instance,
PP_PrivateAccessibilityViewportInfo* viewport_info);
const PP_PrivateAccessibilityViewportInfo* viewport_info);
static void SetAccessibilityDocInfo(
const InstanceHandle& instance,
PP_PrivateAccessibilityDocInfo* doc_info);
const PP_PrivateAccessibilityDocInfo* doc_info);
static void SetAccessibilityPageInfo(
const InstanceHandle& instance,
const PP_PrivateAccessibilityPageInfo* page_info,
Expand Down
8 changes: 6 additions & 2 deletions ppapi/proxy/pdf_resource.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#include <stdlib.h>
#include <string.h>

#include <limits>
#include <utility>
#include <vector>

#include "base/command_line.h"
#include "base/debug/crash_logging.h"
#include "base/metrics/histogram.h"
Expand Down Expand Up @@ -201,12 +205,12 @@ void PDFResource::GetV8ExternalSnapshotData(const char** natives_data_out,
}

void PDFResource::SetAccessibilityDocInfo(
PP_PrivateAccessibilityDocInfo* doc_info) {
const PP_PrivateAccessibilityDocInfo* doc_info) {
Post(RENDERER, PpapiHostMsg_PDF_SetAccessibilityDocInfo(*doc_info));
}

void PDFResource::SetAccessibilityViewportInfo(
PP_PrivateAccessibilityViewportInfo* viewport_info) {
const PP_PrivateAccessibilityViewportInfo* viewport_info) {
Post(RENDERER, PpapiHostMsg_PDF_SetAccessibilityViewportInfo(*viewport_info));
}

Expand Down
6 changes: 4 additions & 2 deletions ppapi/proxy/pdf_resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#ifndef PPAPI_PROXY_PDF_RESOURCE_H_
#define PPAPI_PROXY_PDF_RESOURCE_H_

#include <string>

#include "base/compiler_specific.h"
#include "base/macros.h"
#include "ppapi/c/pp_instance.h"
Expand Down Expand Up @@ -57,9 +59,9 @@ class PPAPI_PROXY_EXPORT PDFResource
const char** snapshot_data_out,
int* snapshot_size_out) override;
void SetAccessibilityViewportInfo(
PP_PrivateAccessibilityViewportInfo* viewport_info) override;
const PP_PrivateAccessibilityViewportInfo* viewport_info) override;
void SetAccessibilityDocInfo(
PP_PrivateAccessibilityDocInfo* doc_info) override;
const PP_PrivateAccessibilityDocInfo* doc_info) override;
void SetAccessibilityPageInfo(
const PP_PrivateAccessibilityPageInfo* page_info,
const PP_PrivateAccessibilityTextRunInfo text_runs[],
Expand Down
4 changes: 2 additions & 2 deletions ppapi/thunk/ppb_pdf_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class PPB_PDF_API {
const char** snapshot_data_out,
int* snapshot_size_out) = 0;
virtual void SetAccessibilityViewportInfo(
PP_PrivateAccessibilityViewportInfo* viewport_info) = 0;
const PP_PrivateAccessibilityViewportInfo* viewport_info) = 0;
virtual void SetAccessibilityDocInfo(
PP_PrivateAccessibilityDocInfo* doc_info) = 0;
const PP_PrivateAccessibilityDocInfo* doc_info) = 0;
virtual void SetAccessibilityPageInfo(
const PP_PrivateAccessibilityPageInfo* page_info,
const PP_PrivateAccessibilityTextRunInfo text_runs[],
Expand Down
4 changes: 2 additions & 2 deletions ppapi/thunk/ppb_pdf_thunk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ void GetV8ExternalSnapshotData(PP_Instance instance,

void SetAccessibilityViewportInfo(
PP_Instance instance,
PP_PrivateAccessibilityViewportInfo* viewport_info) {
const PP_PrivateAccessibilityViewportInfo* viewport_info) {
EnterInstanceAPI<PPB_PDF_API> enter(instance);
if (enter.failed())
return;
enter.functions()->SetAccessibilityViewportInfo(viewport_info);
}

void SetAccessibilityDocInfo(PP_Instance instance,
PP_PrivateAccessibilityDocInfo* doc_info) {
const PP_PrivateAccessibilityDocInfo* doc_info) {
EnterInstanceAPI<PPB_PDF_API> enter(instance);
if (enter.failed())
return;
Expand Down

0 comments on commit b5cdb38

Please sign in to comment.