summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_instance_proxy.cc
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-02-13 13:17:38 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-13 21:18:03 +0000
commit669d47b1bf59279718ab6ef07e9eb69fb42c8aa4 (patch)
treeb15811ec34801807c35d73a74f8ef6b72d10f768 /ppapi/proxy/ppb_instance_proxy.cc
parentfb2a760558d423c55722e2a6f36d9c805f4eb9b6 (diff)
downloadchromium_src-669d47b1bf59279718ab6ef07e9eb69fb42c8aa4.zip
chromium_src-669d47b1bf59279718ab6ef07e9eb69fb42c8aa4.tar.gz
chromium_src-669d47b1bf59279718ab6ef07e9eb69fb42c8aa4.tar.bz2
Enable size_t to int truncation warnings in PPAPI
Also removed a few extra "-Wpedantic" warnings in ppapi_cpp. I don't see a good justification why this should be different than the rest of the project. Fix GN error in media. NOPRESUBMIT=true Review URL: https://codereview.chromium.org/915403003 Cr-Commit-Position: refs/heads/master@{#316289}
Diffstat (limited to 'ppapi/proxy/ppb_instance_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index f8b8ac9..2897757 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -5,6 +5,7 @@
#include "ppapi/proxy/ppb_instance_proxy.h"
#include "base/memory/ref_counted.h"
+#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
#include "build/build_config.h"
#include "media/base/limits.h"
@@ -1302,7 +1303,8 @@ void PPB_Instance_Proxy::OnHostMsgSessionKeysChange(
StringVar::StringToPPVar(session_id));
enter.functions()->SessionKeysChange(
instance, session_id_var.get(), has_additional_usable_key,
- key_information.size(), vector_as_array(&key_information));
+ base::checked_cast<uint32_t>(key_information.size()),
+ vector_as_array(&key_information));
}
}