Commit 4d19c351 authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix interface definitions that were too wide for their IDL types.

Make sure the type on the interface matches the IDL type. All were
unsigned long in the case which maps to uint32_t.

BUG=596846

Change-Id: Iecec0190018d18735d7ffe0c0521af8c7f5514f8
Reviewed-on: https://chromium-review.googlesource.com/1188606Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585860}
parent 571c7ef4
......@@ -73,17 +73,17 @@ DataObject* DataObject::Create() {
DataObject::~DataObject() = default;
size_t DataObject::length() const {
uint32_t DataObject::length() const {
return item_list_.size();
}
DataObjectItem* DataObject::Item(unsigned long index) {
DataObjectItem* DataObject::Item(uint32_t index) {
if (index >= length())
return nullptr;
return item_list_[index];
}
void DataObject::DeleteItem(unsigned long index) {
void DataObject::DeleteItem(uint32_t index) {
if (index >= length())
return;
item_list_.EraseAt(index);
......
......@@ -71,11 +71,11 @@ class CORE_EXPORT DataObject : public GarbageCollectedFinalized<DataObject>,
virtual ~DataObject();
// DataTransferItemList support.
size_t length() const;
DataObjectItem* Item(unsigned long index);
uint32_t length() const;
DataObjectItem* Item(uint32_t index);
// FIXME: Implement V8DataTransferItemList::indexedPropertyDeleter to get this
// called.
void DeleteItem(unsigned long index);
void DeleteItem(uint32_t index);
void ClearAll();
// Returns null if an item already exists with the provided type.
DataObjectItem* Add(const String& data, const String& type);
......
......@@ -38,13 +38,13 @@ DataTransferItemList* DataTransferItemList::Create(DataTransfer* data_transfer,
return new DataTransferItemList(data_transfer, list);
}
size_t DataTransferItemList::length() const {
uint32_t DataTransferItemList::length() const {
if (!data_transfer_->CanReadTypes())
return 0;
return data_object_->length();
}
DataTransferItem* DataTransferItemList::item(unsigned long index) {
DataTransferItem* DataTransferItemList::item(uint32_t index) {
if (!data_transfer_->CanReadTypes())
return nullptr;
DataObjectItem* item = data_object_->Item(index);
......@@ -54,7 +54,7 @@ DataTransferItem* DataTransferItemList::item(unsigned long index) {
return DataTransferItem::Create(data_transfer_, item);
}
void DataTransferItemList::deleteItem(unsigned long index,
void DataTransferItemList::deleteItem(uint32_t index,
ExceptionState& exception_state) {
if (!data_transfer_->CanWriteData()) {
exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
......
......@@ -51,9 +51,9 @@ class CORE_EXPORT DataTransferItemList final : public ScriptWrappable {
public:
static DataTransferItemList* Create(DataTransfer*, DataObject*);
size_t length() const;
DataTransferItem* item(unsigned long index);
void deleteItem(unsigned long index, ExceptionState&);
uint32_t length() const;
DataTransferItem* item(uint32_t index);
void deleteItem(uint32_t index, ExceptionState&);
void clear();
DataTransferItem* add(const String& data,
const String& type,
......
......@@ -29,7 +29,7 @@
namespace blink {
String DOMStringList::item(unsigned index) const {
String DOMStringList::item(uint32_t index) const {
if (index >= strings_.size())
return String();
return strings_[index];
......
......@@ -48,9 +48,9 @@ class CORE_EXPORT DOMStringList final : public ScriptWrappable {
void Sort();
// Implements the IDL.
size_t length() const { return strings_.size(); }
uint32_t length() const { return strings_.size(); }
String item(unsigned index) const;
String item(uint32_t index) const;
bool contains(const String&) const;
operator const Vector<String>&() const { return strings_; }
......
......@@ -82,14 +82,14 @@ Attr* NamedNodeMap::setNamedItemNS(Attr* attr,
return element_->setAttributeNodeNS(attr, exception_state);
}
Attr* NamedNodeMap::item(unsigned index) const {
Attr* NamedNodeMap::item(uint32_t index) const {
AttributeCollection attributes = element_->Attributes();
if (index >= attributes.size())
return nullptr;
return element_->EnsureAttr(attributes[index].GetName());
}
size_t NamedNodeMap::length() const {
uint32_t NamedNodeMap::length() const {
return element_->Attributes().size();
}
......
......@@ -58,8 +58,8 @@ class NamedNodeMap final : public ScriptWrappable {
Attr* setNamedItem(Attr*, ExceptionState&);
Attr* setNamedItemNS(Attr*, ExceptionState&);
Attr* item(unsigned index) const;
size_t length() const;
Attr* item(uint32_t index) const;
uint32_t length() const;
void NamedPropertyEnumerator(Vector<String>& names, ExceptionState&) const;
bool NamedPropertyQuery(const AtomicString&, ExceptionState&) 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