| Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| index d23f9f967155d5914748d97d8b3376813fc85bfa..58660764306e6954d5b6e34fcdf83bcce70c47a6 100644
|
| --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| @@ -18,6 +18,7 @@
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/time/time.h"
|
| #include "base/trace_event/trace_event.h"
|
| +#include "build/build_config.h"
|
| #include "cc/blink/web_layer_impl.h"
|
| #include "cc/layers/texture_layer.h"
|
| #include "content/common/content_constants_internal.h"
|
| @@ -767,7 +768,7 @@ void PepperPluginInstanceImpl::CommitBackingTexture() {
|
| if (!texture_layer_.get())
|
| return;
|
| gpu::Mailbox mailbox;
|
| - uint32 sync_point = 0;
|
| + uint32_t sync_point = 0;
|
| bound_graphics_3d_->GetBackingMailbox(&mailbox, &sync_point);
|
| DCHECK(!mailbox.IsZero());
|
| DCHECK_NE(sync_point, 0u);
|
| @@ -1958,7 +1959,7 @@ void PepperPluginInstanceImpl::UpdateLayer(bool device_changed) {
|
| return;
|
|
|
| gpu::Mailbox mailbox;
|
| - uint32 sync_point = 0;
|
| + uint32_t sync_point = 0;
|
| if (bound_graphics_3d_.get()) {
|
| bound_graphics_3d_->GetBackingMailbox(&mailbox, &sync_point);
|
| DCHECK_EQ(mailbox.IsZero(), sync_point == 0);
|
| @@ -2391,13 +2392,13 @@ PP_Var PepperPluginInstanceImpl::GetDefaultCharSet(PP_Instance instance) {
|
| // Therefore, |content_decryptor_delegate_| must have been initialized when
|
| // the following methods are called.
|
| void PepperPluginInstanceImpl::PromiseResolved(PP_Instance instance,
|
| - uint32 promise_id) {
|
| + uint32_t promise_id) {
|
| content_decryptor_delegate_->OnPromiseResolved(promise_id);
|
| }
|
|
|
| void PepperPluginInstanceImpl::PromiseResolvedWithSession(
|
| PP_Instance instance,
|
| - uint32 promise_id,
|
| + uint32_t promise_id,
|
| PP_Var session_id_var) {
|
| content_decryptor_delegate_->OnPromiseResolvedWithSession(promise_id,
|
| session_id_var);
|
| @@ -2405,9 +2406,9 @@ void PepperPluginInstanceImpl::PromiseResolvedWithSession(
|
|
|
| void PepperPluginInstanceImpl::PromiseRejected(
|
| PP_Instance instance,
|
| - uint32 promise_id,
|
| + uint32_t promise_id,
|
| PP_CdmExceptionCode exception_code,
|
| - uint32 system_code,
|
| + uint32_t system_code,
|
| PP_Var error_description_var) {
|
| content_decryptor_delegate_->OnPromiseRejected(
|
| promise_id, exception_code, system_code, error_description_var);
|
| @@ -2449,7 +2450,7 @@ void PepperPluginInstanceImpl::LegacySessionError(
|
| PP_Instance instance,
|
| PP_Var session_id_var,
|
| PP_CdmExceptionCode exception_code,
|
| - uint32 system_code,
|
| + uint32_t system_code,
|
| PP_Var error_description_var) {
|
| content_decryptor_delegate_->OnLegacySessionError(
|
| session_id_var, exception_code, system_code, error_description_var);
|
| @@ -2540,7 +2541,7 @@ void PepperPluginInstanceImpl::SetTickmarks(PP_Instance instance,
|
|
|
| blink::WebVector<blink::WebRect> tickmarks_converted(
|
| static_cast<size_t>(count));
|
| - for (uint32 i = 0; i < count; ++i) {
|
| + for (uint32_t i = 0; i < count; ++i) {
|
| tickmarks_converted[i] = blink::WebRect(tickmarks[i].point.x,
|
| tickmarks[i].point.y,
|
| tickmarks[i].size.width,
|
|
|