Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1124)

Unified Diff: ppapi/proxy/raw_var_data_unittest.cc

Issue 915403003: Enable size_t to int truncation warnings in PPAPI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ppapi_unittests win x64 Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/ppp_printing_proxy.cc ('k') | ppapi/proxy/serialized_var_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/raw_var_data_unittest.cc
diff --git a/ppapi/proxy/raw_var_data_unittest.cc b/ppapi/proxy/raw_var_data_unittest.cc
index 7dba3451b88a42ce9a54294ceb9c477de1f32ce0..3539d675bebfd41600b065feea85ce532834e024 100644
--- a/ppapi/proxy/raw_var_data_unittest.cc
+++ b/ppapi/proxy/raw_var_data_unittest.cc
@@ -96,7 +96,7 @@ TEST_F(RawVarDataTest, StringTest) {
TEST_F(RawVarDataTest, ArrayBufferTest) {
std::string data = "hello world!";
PP_Var var = PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
- data.size(), data.data());
+ static_cast<uint32_t>(data.size()), data.data());
EXPECT_TRUE(WriteReadAndCompare(var));
var = PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
0, static_cast<void*>(NULL));
@@ -113,25 +113,25 @@ TEST_F(RawVarDataTest, DictionaryArrayTest) {
size_t index = 0;
// Array with primitives.
- array->Set(index++, PP_MakeUndefined());
- array->Set(index++, PP_MakeNull());
- array->Set(index++, PP_MakeInt32(100));
- array->Set(index++, PP_MakeBool(PP_FALSE));
- array->Set(index++, PP_MakeDouble(0.123));
+ array->Set(static_cast<uint32_t>(index++), PP_MakeUndefined());
+ array->Set(static_cast<uint32_t>(index++), PP_MakeNull());
+ array->Set(static_cast<uint32_t>(index++), PP_MakeInt32(100));
+ array->Set(static_cast<uint32_t>(index++), PP_MakeBool(PP_FALSE));
+ array->Set(static_cast<uint32_t>(index++), PP_MakeDouble(0.123));
EXPECT_TRUE(WriteReadAndCompare(array->GetPPVar()));
// Array with 2 references to the same string.
ScopedPPVar release_string(
ScopedPPVar::PassRef(), StringVar::StringToPPVar("abc"));
- array->Set(index++, release_string.get());
- array->Set(index++, release_string.get());
+ array->Set(static_cast<uint32_t>(index++), release_string.get());
+ array->Set(static_cast<uint32_t>(index++), release_string.get());
EXPECT_TRUE(WriteReadAndCompare(array->GetPPVar()));
// Array with nested array that references the same string.
scoped_refptr<ArrayVar> array2(new ArrayVar);
ScopedPPVar release_array2(ScopedPPVar::PassRef(), array2->GetPPVar());
array2->Set(0, release_string.get());
- array->Set(index++, release_array2.get());
+ array->Set(static_cast<uint32_t>(index++), release_array2.get());
EXPECT_TRUE(WriteReadAndCompare(array->GetPPVar()));
// Empty dictionary.
@@ -162,7 +162,7 @@ TEST_F(RawVarDataTest, DictionaryArrayTest) {
EXPECT_TRUE(WriteReadAndCompare(dictionary->GetPPVar()));
// Array with dictionary.
- array->Set(index++, release_dictionary.get());
+ array->Set(static_cast<uint32_t>(index++), release_dictionary.get());
EXPECT_TRUE(WriteReadAndCompare(array->GetPPVar()));
// Array with dictionary with array.
@@ -180,10 +180,10 @@ TEST_F(RawVarDataTest, DictionaryArrayTest) {
dictionary->DeleteWithStringKey("10");
// Array with self references.
- array->Set(index, release_array.get());
+ array->Set(static_cast<uint32_t>(index), release_array.get());
ASSERT_FALSE(WriteAndRead(release_array.get(), &result));
// Break the self reference.
- array->Set(index, PP_MakeUndefined());
+ array->Set(static_cast<uint32_t>(index), PP_MakeUndefined());
}
TEST_F(RawVarDataTest, ResourceTest) {
« no previous file with comments | « ppapi/proxy/ppp_printing_proxy.cc ('k') | ppapi/proxy/serialized_var_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698