Commit b9037986 authored by Andreas Haas's avatar Andreas Haas Committed by Commit Bot

[domarraybuffer] Change constructor params from unsigned to size_t

The internal representation of the size field in the DOMArrayBuffer is
already size_t, now we change the constructors to show that as well.

R=haraken@chromium.org

Bug: 1008840
Change-Id: I35fe71d0b3503244329e527f0df994812bc91387
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1911782
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714576}
parent 655a8e62
...@@ -186,7 +186,7 @@ ScriptPromise Body::arrayBuffer(ScriptState* script_state, ...@@ -186,7 +186,7 @@ ScriptPromise Body::arrayBuffer(ScriptState* script_state,
return ScriptPromise(); return ScriptPromise();
} }
} else { } else {
resolver->Resolve(DOMArrayBuffer::Create(0u, 1)); resolver->Resolve(DOMArrayBuffer::Create(size_t{0}, size_t{0}));
} }
return promise; return promise;
} }
......
...@@ -44,27 +44,27 @@ class CORE_EXPORT ArrayBuffer : public RefCounted<ArrayBuffer> { ...@@ -44,27 +44,27 @@ class CORE_EXPORT ArrayBuffer : public RefCounted<ArrayBuffer> {
USING_FAST_MALLOC(ArrayBuffer); USING_FAST_MALLOC(ArrayBuffer);
public: public:
static inline scoped_refptr<ArrayBuffer> Create(unsigned num_elements, static inline scoped_refptr<ArrayBuffer> Create(size_t num_elements,
unsigned element_byte_size); size_t element_byte_size);
static inline scoped_refptr<ArrayBuffer> Create(ArrayBuffer*); static inline scoped_refptr<ArrayBuffer> Create(ArrayBuffer*);
static inline scoped_refptr<ArrayBuffer> Create(const void* source, static inline scoped_refptr<ArrayBuffer> Create(const void* source,
size_t byte_length); size_t byte_length);
static inline scoped_refptr<ArrayBuffer> Create(ArrayBufferContents&); static inline scoped_refptr<ArrayBuffer> Create(ArrayBufferContents&);
static inline scoped_refptr<ArrayBuffer> CreateOrNull( static inline scoped_refptr<ArrayBuffer> CreateOrNull(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size); size_t element_byte_size);
// Only for use by DOMArrayBuffer::CreateUninitializedOrNull(). // Only for use by DOMArrayBuffer::CreateUninitializedOrNull().
static inline scoped_refptr<ArrayBuffer> CreateUninitializedOrNull( static inline scoped_refptr<ArrayBuffer> CreateUninitializedOrNull(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size); size_t element_byte_size);
static inline scoped_refptr<ArrayBuffer> CreateShared( static inline scoped_refptr<ArrayBuffer> CreateShared(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size); size_t element_byte_size);
static inline scoped_refptr<ArrayBuffer> CreateShared(const void* source, static inline scoped_refptr<ArrayBuffer> CreateShared(const void* source,
unsigned byte_length); size_t byte_length);
inline void* Data(); inline void* Data();
inline const void* Data() const; inline const void* Data() const;
...@@ -98,16 +98,16 @@ class CORE_EXPORT ArrayBuffer : public RefCounted<ArrayBuffer> { ...@@ -98,16 +98,16 @@ class CORE_EXPORT ArrayBuffer : public RefCounted<ArrayBuffer> {
private: private:
static inline scoped_refptr<ArrayBuffer> Create( static inline scoped_refptr<ArrayBuffer> Create(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size, size_t element_byte_size,
ArrayBufferContents::InitializationPolicy); ArrayBufferContents::InitializationPolicy);
static inline scoped_refptr<ArrayBuffer> CreateOrNull( static inline scoped_refptr<ArrayBuffer> CreateOrNull(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size, size_t element_byte_size,
ArrayBufferContents::InitializationPolicy); ArrayBufferContents::InitializationPolicy);
static inline scoped_refptr<ArrayBuffer> CreateShared( static inline scoped_refptr<ArrayBuffer> CreateShared(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size, size_t element_byte_size,
ArrayBufferContents::InitializationPolicy); ArrayBufferContents::InitializationPolicy);
inline unsigned ClampIndex(unsigned index) const; inline unsigned ClampIndex(unsigned index) const;
...@@ -117,8 +117,8 @@ class CORE_EXPORT ArrayBuffer : public RefCounted<ArrayBuffer> { ...@@ -117,8 +117,8 @@ class CORE_EXPORT ArrayBuffer : public RefCounted<ArrayBuffer> {
bool is_detached_; bool is_detached_;
}; };
scoped_refptr<ArrayBuffer> ArrayBuffer::Create(unsigned num_elements, scoped_refptr<ArrayBuffer> ArrayBuffer::Create(size_t num_elements,
unsigned element_byte_size) { size_t element_byte_size) {
return Create(num_elements, element_byte_size, return Create(num_elements, element_byte_size,
ArrayBufferContents::kZeroInitialize); ArrayBufferContents::kZeroInitialize);
} }
...@@ -146,23 +146,22 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::Create(ArrayBufferContents& contents) { ...@@ -146,23 +146,22 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::Create(ArrayBufferContents& contents) {
return base::AdoptRef(new ArrayBuffer(contents)); return base::AdoptRef(new ArrayBuffer(contents));
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::CreateOrNull( scoped_refptr<ArrayBuffer> ArrayBuffer::CreateOrNull(size_t num_elements,
unsigned num_elements, size_t element_byte_size) {
unsigned element_byte_size) {
return CreateOrNull(num_elements, element_byte_size, return CreateOrNull(num_elements, element_byte_size,
ArrayBufferContents::kZeroInitialize); ArrayBufferContents::kZeroInitialize);
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::CreateUninitializedOrNull( scoped_refptr<ArrayBuffer> ArrayBuffer::CreateUninitializedOrNull(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size) { size_t element_byte_size) {
return CreateOrNull(num_elements, element_byte_size, return CreateOrNull(num_elements, element_byte_size,
ArrayBufferContents::kDontInitialize); ArrayBufferContents::kDontInitialize);
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::Create( scoped_refptr<ArrayBuffer> ArrayBuffer::Create(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size, size_t element_byte_size,
ArrayBufferContents::InitializationPolicy policy) { ArrayBufferContents::InitializationPolicy policy) {
ArrayBufferContents contents(num_elements, element_byte_size, ArrayBufferContents contents(num_elements, element_byte_size,
ArrayBufferContents::kNotShared, policy); ArrayBufferContents::kNotShared, policy);
...@@ -172,8 +171,8 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::Create( ...@@ -172,8 +171,8 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::Create(
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::CreateOrNull( scoped_refptr<ArrayBuffer> ArrayBuffer::CreateOrNull(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size, size_t element_byte_size,
ArrayBufferContents::InitializationPolicy policy) { ArrayBufferContents::InitializationPolicy policy) {
ArrayBufferContents contents(num_elements, element_byte_size, ArrayBufferContents contents(num_elements, element_byte_size,
ArrayBufferContents::kNotShared, policy); ArrayBufferContents::kNotShared, policy);
...@@ -182,15 +181,14 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::CreateOrNull( ...@@ -182,15 +181,14 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::CreateOrNull(
return base::AdoptRef(new ArrayBuffer(contents)); return base::AdoptRef(new ArrayBuffer(contents));
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared( scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared(size_t num_elements,
unsigned num_elements, size_t element_byte_size) {
unsigned element_byte_size) {
return CreateShared(num_elements, element_byte_size, return CreateShared(num_elements, element_byte_size,
ArrayBufferContents::kZeroInitialize); ArrayBufferContents::kZeroInitialize);
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared(const void* source, scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared(const void* source,
unsigned byte_length) { size_t byte_length) {
ArrayBufferContents contents(byte_length, 1, ArrayBufferContents::kShared, ArrayBufferContents contents(byte_length, 1, ArrayBufferContents::kShared,
ArrayBufferContents::kDontInitialize); ArrayBufferContents::kDontInitialize);
CHECK(contents.DataShared()); CHECK(contents.DataShared());
...@@ -200,8 +198,8 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared(const void* source, ...@@ -200,8 +198,8 @@ scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared(const void* source,
} }
scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared( scoped_refptr<ArrayBuffer> ArrayBuffer::CreateShared(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size, size_t element_byte_size,
ArrayBufferContents::InitializationPolicy policy) { ArrayBufferContents::InitializationPolicy policy) {
ArrayBufferContents contents(num_elements, element_byte_size, ArrayBufferContents contents(num_elements, element_byte_size,
ArrayBufferContents::kShared, policy); ArrayBufferContents::kShared, policy);
......
...@@ -41,8 +41,8 @@ bool DOMArrayBuffer::Transfer(v8::Isolate* isolate, ...@@ -41,8 +41,8 @@ bool DOMArrayBuffer::Transfer(v8::Isolate* isolate,
ArrayBufferContents& result) { ArrayBufferContents& result) {
DOMArrayBuffer* to_transfer = this; DOMArrayBuffer* to_transfer = this;
if (!IsDetachable(isolate)) { if (!IsDetachable(isolate)) {
to_transfer = DOMArrayBuffer::Create(Buffer()->Data(), to_transfer =
Buffer()->ByteLengthAsUnsigned()); DOMArrayBuffer::Create(Buffer()->Data(), Buffer()->ByteLengthAsSizeT());
} }
if (!to_transfer->Buffer()->Transfer(result)) if (!to_transfer->Buffer()->Transfer(result))
...@@ -59,8 +59,8 @@ bool DOMArrayBuffer::Transfer(v8::Isolate* isolate, ...@@ -59,8 +59,8 @@ bool DOMArrayBuffer::Transfer(v8::Isolate* isolate,
} }
DOMArrayBuffer* DOMArrayBuffer::CreateUninitializedOrNull( DOMArrayBuffer* DOMArrayBuffer::CreateUninitializedOrNull(
unsigned num_elements, size_t num_elements,
unsigned element_byte_size) { size_t element_byte_size) {
scoped_refptr<ArrayBuffer> buffer = scoped_refptr<ArrayBuffer> buffer =
ArrayBuffer::CreateUninitializedOrNull(num_elements, element_byte_size); ArrayBuffer::CreateUninitializedOrNull(num_elements, element_byte_size);
if (!buffer) if (!buffer)
......
...@@ -20,11 +20,10 @@ class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase { ...@@ -20,11 +20,10 @@ class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase {
static DOMArrayBuffer* Create(scoped_refptr<ArrayBuffer> buffer) { static DOMArrayBuffer* Create(scoped_refptr<ArrayBuffer> buffer) {
return MakeGarbageCollected<DOMArrayBuffer>(std::move(buffer)); return MakeGarbageCollected<DOMArrayBuffer>(std::move(buffer));
} }
static DOMArrayBuffer* Create(unsigned num_elements, static DOMArrayBuffer* Create(size_t num_elements, size_t element_byte_size) {
unsigned element_byte_size) {
return Create(ArrayBuffer::Create(num_elements, element_byte_size)); return Create(ArrayBuffer::Create(num_elements, element_byte_size));
} }
static DOMArrayBuffer* Create(const void* source, unsigned byte_length) { static DOMArrayBuffer* Create(const void* source, size_t byte_length) {
return Create(ArrayBuffer::Create(source, byte_length)); return Create(ArrayBuffer::Create(source, byte_length));
} }
static DOMArrayBuffer* Create(ArrayBufferContents& contents) { static DOMArrayBuffer* Create(ArrayBufferContents& contents) {
...@@ -36,8 +35,8 @@ class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase { ...@@ -36,8 +35,8 @@ class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase {
// Only for use by XMLHttpRequest::responseArrayBuffer, // Only for use by XMLHttpRequest::responseArrayBuffer,
// Internals::serializeObject, and // Internals::serializeObject, and
// FetchDataLoaderAsArrayBuffer::OnStateChange. // FetchDataLoaderAsArrayBuffer::OnStateChange.
static DOMArrayBuffer* CreateUninitializedOrNull(unsigned num_elements, static DOMArrayBuffer* CreateUninitializedOrNull(size_t num_elements,
unsigned element_byte_size); size_t element_byte_size);
explicit DOMArrayBuffer(scoped_refptr<ArrayBuffer> buffer) explicit DOMArrayBuffer(scoped_refptr<ArrayBuffer> buffer)
: DOMArrayBufferBase(std::move(buffer)) {} : DOMArrayBufferBase(std::move(buffer)) {}
......
...@@ -184,8 +184,7 @@ String RTCQuicTransport::state() const { ...@@ -184,8 +184,7 @@ String RTCQuicTransport::state() const {
} }
DOMArrayBuffer* RTCQuicTransport::getKey() const { DOMArrayBuffer* RTCQuicTransport::getKey() const {
return DOMArrayBuffer::Create(key_->Data(), return DOMArrayBuffer::Create(key_->Data(), key_->ByteLengthAsSizeT());
key_->DeprecatedByteLengthAsUnsigned());
} }
void RTCQuicTransport::connect(ExceptionState& exception_state) { void RTCQuicTransport::connect(ExceptionState& exception_state) {
......
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