diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_builder.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_builder.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_builder.cc b/chromium/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_builder.cc index b35101e3fd3..4a2561a2bee 100644 --- a/chromium/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_builder.cc +++ b/chromium/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_builder.cc @@ -43,7 +43,7 @@ ArrayBufferBuilder::ArrayBufferBuilder() } bool ArrayBufferBuilder::ExpandCapacity(unsigned size_to_increase) { - unsigned current_buffer_size = buffer_->ByteLength(); + size_t current_buffer_size = buffer_->ByteLength(); // If the size of the buffer exceeds max of unsigned, it can't be grown any // more. @@ -55,8 +55,10 @@ bool ArrayBufferBuilder::ExpandCapacity(unsigned size_to_increase) { // Grow exponentially if possible. unsigned exponential_growth_new_buffer_size = std::numeric_limits<unsigned>::max(); - if (current_buffer_size <= std::numeric_limits<unsigned>::max() / 2) - exponential_growth_new_buffer_size = current_buffer_size * 2; + if (current_buffer_size <= std::numeric_limits<unsigned>::max() / 2) { + exponential_growth_new_buffer_size = + static_cast<unsigned>(current_buffer_size * 2); + } if (exponential_growth_new_buffer_size > new_buffer_size) new_buffer_size = exponential_growth_new_buffer_size; @@ -74,11 +76,11 @@ bool ArrayBufferBuilder::ExpandCapacity(unsigned size_to_increase) { unsigned ArrayBufferBuilder::Append(const char* data, unsigned length) { DCHECK_GT(length, 0u); - unsigned current_buffer_size = buffer_->ByteLength(); + size_t current_buffer_size = buffer_->ByteLength(); DCHECK_LE(bytes_used_, current_buffer_size); - unsigned remaining_buffer_space = current_buffer_size - bytes_used_; + size_t remaining_buffer_space = current_buffer_size - bytes_used_; unsigned bytes_to_save = length; @@ -87,7 +89,7 @@ unsigned ArrayBufferBuilder::Append(const char* data, unsigned length) { if (!ExpandCapacity(length)) return 0; } else { - bytes_to_save = remaining_buffer_space; + bytes_to_save = static_cast<unsigned>(remaining_buffer_space); } } |