Commit b11c0ade authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix a few more 64 bit truncation warnings.

Apply casts where necessary. These are all safe.

BUG=879657

Change-Id: Ia0a79b09796ed065a06e60ef880248cadcef3490
Reviewed-on: https://chromium-review.googlesource.com/c/1355775
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612682}
parent 8a63e469
...@@ -697,7 +697,7 @@ void ToFlexibleArrayBufferView(v8::Isolate* isolate, ...@@ -697,7 +697,7 @@ void ToFlexibleArrayBufferView(v8::Isolate* isolate,
} }
size_t length = buffer->ByteLength(); size_t length = buffer->ByteLength();
buffer->CopyContents(storage, length); buffer->CopyContents(storage, length);
result.SetSmall(storage, length); result.SetSmall(storage, SafeCast<uint32_t>(length));
} }
static ScriptState* ToScriptStateImpl(LocalFrame* frame, static ScriptState* ToScriptStateImpl(LocalFrame* frame,
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h"
#include "third_party/blink/renderer/platform/heap/persistent.h" #include "third_party/blink/renderer/platform/heap/persistent.h"
#include "third_party/blink/renderer/platform/wtf/functional.h" #include "third_party/blink/renderer/platform/wtf/functional.h"
#include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
namespace blink { namespace blink {
...@@ -96,7 +97,7 @@ BytesConsumer::Result DataPipeBytesConsumer::EndRead(size_t read) { ...@@ -96,7 +97,7 @@ BytesConsumer::Result DataPipeBytesConsumer::EndRead(size_t read) {
DCHECK(is_in_two_phase_read_); DCHECK(is_in_two_phase_read_);
is_in_two_phase_read_ = false; is_in_two_phase_read_ = false;
DCHECK(IsReadableOrWaiting()); DCHECK(IsReadableOrWaiting());
MojoResult rv = data_pipe_->EndReadData(read); MojoResult rv = data_pipe_->EndReadData(SafeCast<uint32_t>(read));
if (rv != MOJO_RESULT_OK) { if (rv != MOJO_RESULT_OK) {
SetError(Error("error")); SetError(Error("error"));
return Result::kError; return Result::kError;
......
...@@ -138,12 +138,13 @@ struct GridSpan { ...@@ -138,12 +138,13 @@ struct GridSpan {
private: private:
enum GridSpanType { kUntranslatedDefinite, kTranslatedDefinite, kIndefinite }; enum GridSpanType { kUntranslatedDefinite, kTranslatedDefinite, kIndefinite };
GridSpan(int start_line, int end_line, GridSpanType type) : type_(type) { template <typename T>
GridSpan(T start_line, T end_line, GridSpanType type) : type_(type) {
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
DCHECK_LT(start_line, end_line); DCHECK_LT(start_line, end_line);
if (type == kTranslatedDefinite) { if (type == kTranslatedDefinite) {
DCHECK_GE(start_line, 0); DCHECK_GE(start_line, static_cast<T>(0));
DCHECK_GT(end_line, 0); DCHECK_GT(end_line, static_cast<T>(0));
} }
#endif #endif
......
...@@ -19,7 +19,7 @@ class CORE_EXPORT FlexibleArrayBufferView { ...@@ -19,7 +19,7 @@ class CORE_EXPORT FlexibleArrayBufferView {
FlexibleArrayBufferView() : small_data_(nullptr), small_length_(0) {} FlexibleArrayBufferView() : small_data_(nullptr), small_length_(0) {}
void SetFull(DOMArrayBufferView* full) { full_ = full; } void SetFull(DOMArrayBufferView* full) { full_ = full; }
void SetSmall(void* data, size_t length) { void SetSmall(void* data, uint32_t length) {
small_data_ = data; small_data_ = data;
small_length_ = length; small_length_ = length;
} }
...@@ -62,7 +62,7 @@ class CORE_EXPORT FlexibleArrayBufferView { ...@@ -62,7 +62,7 @@ class CORE_EXPORT FlexibleArrayBufferView {
Member<DOMArrayBufferView> full_; Member<DOMArrayBufferView> full_;
void* small_data_; void* small_data_;
size_t small_length_; uint32_t small_length_;
DISALLOW_COPY_AND_ASSIGN(FlexibleArrayBufferView); DISALLOW_COPY_AND_ASSIGN(FlexibleArrayBufferView);
}; };
......
...@@ -276,9 +276,9 @@ inline v8::Local<v8::String> V8String(v8::Isolate* isolate, ...@@ -276,9 +276,9 @@ inline v8::Local<v8::String> V8String(v8::Isolate* isolate,
DCHECK(isolate); DCHECK(isolate);
if (!string || string[0] == '\0') if (!string || string[0] == '\0')
return v8::String::Empty(isolate); return v8::String::Empty(isolate);
return v8::String::NewFromOneByte(isolate, return v8::String::NewFromOneByte(
reinterpret_cast<const uint8_t*>(string), isolate, reinterpret_cast<const uint8_t*>(string),
v8::NewStringType::kNormal, strlen(string)) v8::NewStringType::kNormal, static_cast<int>(strlen(string)))
.ToLocalChecked(); .ToLocalChecked();
} }
...@@ -324,7 +324,7 @@ inline v8::Local<v8::String> V8AtomicString(v8::Isolate* isolate, ...@@ -324,7 +324,7 @@ inline v8::Local<v8::String> V8AtomicString(v8::Isolate* isolate,
return v8::String::Empty(isolate); return v8::String::Empty(isolate);
return v8::String::NewFromOneByte( return v8::String::NewFromOneByte(
isolate, reinterpret_cast<const uint8_t*>(string), isolate, reinterpret_cast<const uint8_t*>(string),
v8::NewStringType::kInternalized, strlen(string)) v8::NewStringType::kInternalized, static_cast<int>(strlen(string)))
.ToLocalChecked(); .ToLocalChecked();
} }
......
...@@ -253,7 +253,10 @@ const void* ArrayBuffer::DataMaybeShared() const { ...@@ -253,7 +253,10 @@ const void* ArrayBuffer::DataMaybeShared() const {
} }
unsigned ArrayBuffer::ByteLength() const { unsigned ArrayBuffer::ByteLength() const {
return contents_.DataLength(); // TODO(dtapuska): Revisit this cast. ArrayBufferContents
// uses size_t for storing data. Whereas ArrayBuffer IDL is
// only uint32_t based.
return static_cast<unsigned>(contents_.DataLength());
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::Slice(int begin, int end) const { scoped_refptr<ArrayBuffer> ArrayBuffer::Slice(int begin, int end) const {
......
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