summaryrefslogtreecommitdiffstats
path: root/pdf/out_of_process_instance.cc
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-21 11:49:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-21 19:50:35 +0000
commita7c09d567e2878e1e3a33e1b627a11f568cf93b4 (patch)
treed8335d4dd60b638d203945ebcecc22842a648d4b /pdf/out_of_process_instance.cc
parent360c186bfcca1dac73ff32d90c99ec476dbe28e0 (diff)
downloadchromium_src-a7c09d567e2878e1e3a33e1b627a11f568cf93b4.zip
chromium_src-a7c09d567e2878e1e3a33e1b627a11f568cf93b4.tar.gz
chromium_src-a7c09d567e2878e1e3a33e1b627a11f568cf93b4.tar.bz2
Switch to standard integer types in pdf/.
BUG=138542 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1533413002 Cr-Commit-Position: refs/heads/master@{#366446}
Diffstat (limited to 'pdf/out_of_process_instance.cc')
-rw-r--r--pdf/out_of_process_instance.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index cd71961..875642f 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -4,6 +4,9 @@
#include "pdf/out_of_process_instance.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <algorithm> // for min/max()
#define _USE_MATH_DEFINES // for M_PI
#include <cmath> // for log() and pow()
@@ -816,11 +819,11 @@ int OutOfProcessInstance::GetDocumentPixelHeight() const {
ceil(document_size_.height() * zoom_ * device_scale_));
}
-void OutOfProcessInstance::FillRect(const pp::Rect& rect, uint32 color) {
+void OutOfProcessInstance::FillRect(const pp::Rect& rect, uint32_t color) {
DCHECK(!image_data_.is_null() || rect.IsEmpty());
- uint32* buffer_start = static_cast<uint32*>(image_data_.data());
+ uint32_t* buffer_start = static_cast<uint32_t*>(image_data_.data());
int stride = image_data_.stride();
- uint32* ptr = buffer_start + rect.y() * stride / 4 + rect.x();
+ uint32_t* ptr = buffer_start + rect.y() * stride / 4 + rect.x();
int height = rect.height();
int width = rect.width();
for (int y = 0; y < height; ++y) {
@@ -1252,8 +1255,8 @@ void OutOfProcessInstance::DocumentHasUnsupportedFeature(
pp::PDF::HasUnsupportedFeature(this);
}
-void OutOfProcessInstance::DocumentLoadProgress(uint32 available,
- uint32 doc_size) {
+void OutOfProcessInstance::DocumentLoadProgress(uint32_t available,
+ uint32_t doc_size) {
double progress = 0.0;
if (doc_size == 0) {
// Document size is unknown. Use heuristics.
@@ -1380,7 +1383,7 @@ bool OutOfProcessInstance::IsPrintPreview() {
return IsPrintPreviewUrl(url_);
}
-uint32 OutOfProcessInstance::GetBackgroundColor() {
+uint32_t OutOfProcessInstance::GetBackgroundColor() {
return background_color_;
}