summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp
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/cpp
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/cpp')
-rw-r--r--ppapi/cpp/dev/file_chooser_dev.cc2
-rw-r--r--ppapi/cpp/dev/ime_input_event_dev.cc3
-rw-r--r--ppapi/cpp/dev/scriptable_object_deprecated.cc4
-rw-r--r--ppapi/cpp/dev/video_decoder_dev.cc2
-rw-r--r--ppapi/cpp/input_event.cc3
-rw-r--r--ppapi/cpp/private/content_decryptor_private.cc3
-rw-r--r--ppapi/cpp/private/flash_clipboard.cc6
7 files changed, 13 insertions, 10 deletions
diff --git a/ppapi/cpp/dev/file_chooser_dev.cc b/ppapi/cpp/dev/file_chooser_dev.cc
index b7124a1..2efb346 100644
--- a/ppapi/cpp/dev/file_chooser_dev.cc
+++ b/ppapi/cpp/dev/file_chooser_dev.cc
@@ -82,7 +82,7 @@ void FileChooser_Dev::CallbackConverter(void* user_data, int32_t result) {
// number of items is 0.
void* output_buf = data->output.GetDataBuffer(
data->output.user_data,
- selected_files.size(), sizeof(PP_Resource));
+ static_cast<uint32_t>(selected_files.size()), sizeof(PP_Resource));
if (output_buf) {
if (!selected_files.empty()) {
memcpy(output_buf, &selected_files[0],
diff --git a/ppapi/cpp/dev/ime_input_event_dev.cc b/ppapi/cpp/dev/ime_input_event_dev.cc
index 9ddc16e..3396a39 100644
--- a/ppapi/cpp/dev/ime_input_event_dev.cc
+++ b/ppapi/cpp/dev/ime_input_event_dev.cc
@@ -61,7 +61,8 @@ IMEInputEvent_Dev::IMEInputEvent_Dev(
uint32_t dummy = 0;
PassRefFromConstructor(get_interface<PPB_IMEInputEvent_Dev_0_2>()->Create(
instance.pp_instance(), type, time_stamp, text.pp_var(),
- segment_offsets.empty() ? 0 : segment_offsets.size() - 1,
+ segment_offsets.empty() ? 0u :
+ static_cast<uint32_t>(segment_offsets.size() - 1),
segment_offsets.empty() ? &dummy : &segment_offsets[0],
target_segment, selection.first, selection.second));
}
diff --git a/ppapi/cpp/dev/scriptable_object_deprecated.cc b/ppapi/cpp/dev/scriptable_object_deprecated.cc
index 1b701cb..19c4738 100644
--- a/ppapi/cpp/dev/scriptable_object_deprecated.cc
+++ b/ppapi/cpp/dev/scriptable_object_deprecated.cc
@@ -73,8 +73,8 @@ void GetAllPropertyNames(void* object,
const PPB_Memory_Dev* memory_if = static_cast<const PPB_Memory_Dev*>(
pp::Module::Get()->GetBrowserInterface(PPB_MEMORY_DEV_INTERFACE));
- *properties = static_cast<PP_Var*>(
- memory_if->MemAlloc(sizeof(PP_Var) * props.size()));
+ *properties = static_cast<PP_Var*>(memory_if->MemAlloc(
+ static_cast<uint32_t>(sizeof(PP_Var) * props.size())));
for (size_t i = 0; i < props.size(); ++i)
(*properties)[i] = props[i].Detach();
diff --git a/ppapi/cpp/dev/video_decoder_dev.cc b/ppapi/cpp/dev/video_decoder_dev.cc
index dcc3b5d..df34986 100644
--- a/ppapi/cpp/dev/video_decoder_dev.cc
+++ b/ppapi/cpp/dev/video_decoder_dev.cc
@@ -42,7 +42,7 @@ void VideoDecoder_Dev::AssignPictureBuffers(
if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
return;
get_interface<PPB_VideoDecoder_Dev>()->AssignPictureBuffers(
- pp_resource(), buffers.size(), &buffers[0]);
+ pp_resource(), static_cast<uint32_t>(buffers.size()), &buffers[0]);
}
int32_t VideoDecoder_Dev::Decode(
diff --git a/ppapi/cpp/input_event.cc b/ppapi/cpp/input_event.cc
index 93385bf..90f41fa 100644
--- a/ppapi/cpp/input_event.cc
+++ b/ppapi/cpp/input_event.cc
@@ -364,7 +364,8 @@ IMEInputEvent::IMEInputEvent(
uint32_t dummy = 0;
PassRefFromConstructor(get_interface<PPB_IMEInputEvent_1_0>()->Create(
instance.pp_instance(), type, time_stamp, text.pp_var(),
- segment_offsets.empty() ? 0 : segment_offsets.size() - 1,
+ segment_offsets.empty() ? 0u :
+ static_cast<uint32_t>(segment_offsets.size() - 1),
segment_offsets.empty() ? &dummy : &segment_offsets[0],
target_segment, selection.first, selection.second));
}
diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
index 76dc2f3..1e26661 100644
--- a/ppapi/cpp/private/content_decryptor_private.cc
+++ b/ppapi/cpp/private/content_decryptor_private.cc
@@ -329,7 +329,8 @@ void ContentDecryptor_Private::SessionKeysChange(
pp::Var session_id_var(session_id);
get_interface<PPB_ContentDecryptor_Private>()->SessionKeysChange(
associated_instance_.pp_instance(), session_id_var.pp_var(),
- PP_FromBool(has_additional_usable_key), key_information.size(),
+ PP_FromBool(has_additional_usable_key),
+ static_cast<uint32_t>(key_information.size()),
key_information.empty() ? NULL : &key_information[0]);
}
}
diff --git a/ppapi/cpp/private/flash_clipboard.cc b/ppapi/cpp/private/flash_clipboard.cc
index 77e68ba..1fb5288 100644
--- a/ppapi/cpp/private/flash_clipboard.cc
+++ b/ppapi/cpp/private/flash_clipboard.cc
@@ -133,7 +133,7 @@ bool Clipboard::WriteData(
rv = (get_interface<PPB_Flash_Clipboard_5_1>()->WriteData(
instance.pp_instance(),
clipboard_type,
- data_items.size(),
+ static_cast<uint32_t>(data_items.size()),
formats_ptr,
data_items_ptr) == PP_OK);
} else if (has_interface<PPB_Flash_Clipboard_5_0>()) {
@@ -155,7 +155,7 @@ bool Clipboard::WriteData(
rv = (get_interface<PPB_Flash_Clipboard_5_0>()->WriteData(
instance.pp_instance(),
clipboard_type,
- data_items.size(),
+ static_cast<uint32_t>(data_items.size()),
formats_ptr,
data_items_ptr) == PP_OK);
} else if (has_interface<PPB_Flash_Clipboard_4_0>()) {
@@ -180,7 +180,7 @@ bool Clipboard::WriteData(
rv = (get_interface<PPB_Flash_Clipboard_4_0>()->WriteData(
instance.pp_instance(),
clipboard_type,
- data_items.size(),
+ static_cast<uint32_t>(data_items.size()),
formats_ptr,
data_items_ptr) == PP_OK);
}