Commit 610ae98b authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix 64 bit truncations in renderer/modules.

Fix a few last truncation errors.

BUG=879657

Change-Id: I75339fe7a46efa336bdaa91c73c21a5c673b32f3
Reviewed-on: https://chromium-review.googlesource.com/c/1355856Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612462}
parent 49acd6a5
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/modules/peerconnection/adapters/p2p_quic_stream_impl.h" #include "third_party/blink/renderer/modules/peerconnection/adapters/p2p_quic_stream_impl.h"
#include "net/third_party/quic/core/quic_error_codes.h" #include "net/third_party/quic/core/quic_error_codes.h"
#include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
namespace blink { namespace blink {
...@@ -85,7 +86,7 @@ void P2PQuicStreamImpl::OnStreamDataConsumed(size_t bytes_consumed) { ...@@ -85,7 +86,7 @@ void P2PQuicStreamImpl::OnStreamDataConsumed(size_t bytes_consumed) {
QuicStream::OnStreamDataConsumed(bytes_consumed); QuicStream::OnStreamDataConsumed(bytes_consumed);
if (bytes_consumed > 0) { if (bytes_consumed > 0) {
write_buffered_amount_ -= bytes_consumed; write_buffered_amount_ -= bytes_consumed;
delegate_->OnWriteDataConsumed(bytes_consumed); delegate_->OnWriteDataConsumed(SafeCast<uint32_t>(bytes_consumed));
} }
} }
......
...@@ -14,7 +14,8 @@ wtf_size_t ByteBufferQueue::ReadInto(base::span<uint8_t> buffer_out) { ...@@ -14,7 +14,8 @@ wtf_size_t ByteBufferQueue::ReadInto(base::span<uint8_t> buffer_out) {
.subspan(front_buffer_offset_); .subspan(front_buffer_offset_);
DCHECK_GT(front_buffer.size(), 0u); DCHECK_GT(front_buffer.size(), 0u);
wtf_size_t buffer_read_amount = wtf_size_t buffer_read_amount =
std::min(buffer_out.size(), front_buffer.size()); std::min(static_cast<wtf_size_t>(buffer_out.size()),
static_cast<wtf_size_t>(front_buffer.size()));
memcpy(buffer_out.data(), front_buffer.data(), buffer_read_amount); memcpy(buffer_out.data(), front_buffer.data(), buffer_read_amount);
read_amount += buffer_read_amount; read_amount += buffer_read_amount;
buffer_out = buffer_out.subspan(buffer_read_amount); buffer_out = buffer_out.subspan(buffer_read_amount);
......
...@@ -102,7 +102,7 @@ int SQLiteStatement::Prepare() { ...@@ -102,7 +102,7 @@ int SQLiteStatement::Prepare() {
// Pass the length of the string including the null character to // Pass the length of the string including the null character to
// sqlite3_prepare_v2; this lets SQLite avoid an extra string copy. // sqlite3_prepare_v2; this lets SQLite avoid an extra string copy.
size_t length_including_null_character = query.length() + 1; wtf_size_t length_including_null_character = query.length() + 1;
error = sqlite3_prepare_v2(database_.Sqlite3Handle(), query.data(), error = sqlite3_prepare_v2(database_.Sqlite3Handle(), query.data(),
length_including_null_character, statement.get(), length_including_null_character, statement.get(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment