| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef Array_h | 5 #ifndef Array_h |
| 6 #define Array_h | 6 #define Array_h |
| 7 | 7 |
| 8 #include "platform/PlatformExport.h" | 8 #include "platform/PlatformExport.h" |
| 9 #include "platform/inspector_protocol/Collections.h" | 9 #include "platform/inspector_protocol/Collections.h" |
| 10 #include "platform/inspector_protocol/ErrorSupport.h" | 10 #include "platform/inspector_protocol/ErrorSupport.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 errors->push(); | 33 errors->push(); |
| 34 OwnPtr<Array<T>> result = adoptPtr(new Array<T>()); | 34 OwnPtr<Array<T>> result = adoptPtr(new Array<T>()); |
| 35 for (size_t i = 0; i < array->size(); ++i) { | 35 for (size_t i = 0; i < array->size(); ++i) { |
| 36 errors->setName(String16::number(i)); | 36 errors->setName(String16::number(i)); |
| 37 T item = FromValue<T>::parse(array->at(i), errors); | 37 T item = FromValue<T>::parse(array->at(i), errors); |
| 38 result->m_vector.append(item); | 38 result->m_vector.append(item); |
| 39 } | 39 } |
| 40 errors->pop(); | 40 errors->pop(); |
| 41 if (errors->hasErrors()) | 41 if (errors->hasErrors()) |
| 42 return nullptr; | 42 return nullptr; |
| 43 return result.release(); | 43 return result; |
| 44 } | 44 } |
| 45 | 45 |
| 46 void addItem(const T& value) | 46 void addItem(const T& value) |
| 47 { | 47 { |
| 48 m_vector.append(value); | 48 m_vector.append(value); |
| 49 } | 49 } |
| 50 | 50 |
| 51 size_t length() | 51 size_t length() |
| 52 { | 52 { |
| 53 return m_vector.size(); | 53 return m_vector.size(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 T get(size_t index) | 56 T get(size_t index) |
| 57 { | 57 { |
| 58 return m_vector[index]; | 58 return m_vector[index]; |
| 59 } | 59 } |
| 60 | 60 |
| 61 PassOwnPtr<protocol::ListValue> serialize() | 61 PassOwnPtr<protocol::ListValue> serialize() |
| 62 { | 62 { |
| 63 OwnPtr<protocol::ListValue> result = ListValue::create(); | 63 OwnPtr<protocol::ListValue> result = ListValue::create(); |
| 64 for (auto& item : m_vector) | 64 for (auto& item : m_vector) |
| 65 result->pushValue(toValue(item)); | 65 result->pushValue(toValue(item)); |
| 66 return result.release(); | 66 return result; |
| 67 } | 67 } |
| 68 | 68 |
| 69 private: | 69 private: |
| 70 protocol::Vector<T> m_vector; | 70 protocol::Vector<T> m_vector; |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 template<> class Array<String> : public ArrayBase<String> {}; | 73 template<> class Array<String> : public ArrayBase<String> {}; |
| 74 template<> class Array<String16> : public ArrayBase<String16> {}; | 74 template<> class Array<String16> : public ArrayBase<String16> {}; |
| 75 template<> class Array<int> : public ArrayBase<int> {}; | 75 template<> class Array<int> : public ArrayBase<int> {}; |
| 76 template<> class Array<double> : public ArrayBase<double> {}; | 76 template<> class Array<double> : public ArrayBase<double> {}; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 89 protocol::ListValue* array = ListValue::cast(value); | 89 protocol::ListValue* array = ListValue::cast(value); |
| 90 if (!array) { | 90 if (!array) { |
| 91 errors->addError("array expected"); | 91 errors->addError("array expected"); |
| 92 return nullptr; | 92 return nullptr; |
| 93 } | 93 } |
| 94 OwnPtr<Array<T>> result = adoptPtr(new Array<T>()); | 94 OwnPtr<Array<T>> result = adoptPtr(new Array<T>()); |
| 95 errors->push(); | 95 errors->push(); |
| 96 for (size_t i = 0; i < array->size(); ++i) { | 96 for (size_t i = 0; i < array->size(); ++i) { |
| 97 errors->setName(String16::number(i)); | 97 errors->setName(String16::number(i)); |
| 98 OwnPtr<T> item = FromValue<T>::parse(array->at(i), errors); | 98 OwnPtr<T> item = FromValue<T>::parse(array->at(i), errors); |
| 99 result->m_vector.append(item.release()); | 99 result->m_vector.append(std::move(item)); |
| 100 } | 100 } |
| 101 errors->pop(); | 101 errors->pop(); |
| 102 if (errors->hasErrors()) | 102 if (errors->hasErrors()) |
| 103 return nullptr; | 103 return nullptr; |
| 104 return result.release(); | 104 return result; |
| 105 } | 105 } |
| 106 | 106 |
| 107 void addItem(PassOwnPtr<T> value) | 107 void addItem(PassOwnPtr<T> value) |
| 108 { | 108 { |
| 109 m_vector.append(std::move(value)); | 109 m_vector.append(std::move(value)); |
| 110 } | 110 } |
| 111 | 111 |
| 112 size_t length() | 112 size_t length() |
| 113 { | 113 { |
| 114 return m_vector.size(); | 114 return m_vector.size(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 T* get(size_t index) | 117 T* get(size_t index) |
| 118 { | 118 { |
| 119 return m_vector[index].get(); | 119 return m_vector[index].get(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 PassOwnPtr<protocol::ListValue> serialize() | 122 PassOwnPtr<protocol::ListValue> serialize() |
| 123 { | 123 { |
| 124 OwnPtr<protocol::ListValue> result = ListValue::create(); | 124 OwnPtr<protocol::ListValue> result = ListValue::create(); |
| 125 for (auto& item : m_vector) | 125 for (auto& item : m_vector) |
| 126 result->pushValue(toValue(item.get())); | 126 result->pushValue(toValue(item.get())); |
| 127 return result.release(); | 127 return result; |
| 128 } | 128 } |
| 129 | 129 |
| 130 private: | 130 private: |
| 131 protocol::Vector<OwnPtr<T>> m_vector; | 131 protocol::Vector<OwnPtr<T>> m_vector; |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 } // namespace platform | 134 } // namespace platform |
| 135 } // namespace blink | 135 } // namespace blink |
| 136 | 136 |
| 137 #endif // !defined(Array_h) | 137 #endif // !defined(Array_h) |
| OLD | NEW |