| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 1645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1656 { | 1656 { |
| 1657 } | 1657 } |
| 1658 | 1658 |
| 1659 template<size_t otherCapacity> | 1659 template<size_t otherCapacity> |
| 1660 HeapVector(const HeapVector<T, otherCapacity>& other) | 1660 HeapVector(const HeapVector<T, otherCapacity>& other) |
| 1661 : Vector<T, inlineCapacity, HeapAllocator>(other) | 1661 : Vector<T, inlineCapacity, HeapAllocator>(other) |
| 1662 { | 1662 { |
| 1663 } | 1663 } |
| 1664 | 1664 |
| 1665 template<typename U> | 1665 template<typename U> |
| 1666 void append(const U* data, size_t dataSize) |
| 1667 { |
| 1668 Vector<T, inlineCapacity, HeapAllocator>::append(data, dataSize); |
| 1669 } |
| 1670 |
| 1671 template<typename U> |
| 1666 void append(const U& other) | 1672 void append(const U& other) |
| 1667 { | 1673 { |
| 1668 Vector<T, inlineCapacity, HeapAllocator>::append(other); | 1674 Vector<T, inlineCapacity, HeapAllocator>::append(other); |
| 1669 } | 1675 } |
| 1670 | 1676 |
| 1671 template<typename U, size_t otherCapacity> | 1677 template<typename U, size_t otherCapacity> |
| 1672 void appendVector(const HeapVector<U, otherCapacity>& other) | 1678 void appendVector(const HeapVector<U, otherCapacity>& other) |
| 1673 { | 1679 { |
| 1674 const Vector<U, otherCapacity, HeapAllocator>& otherVector = other; | 1680 const Vector<U, otherCapacity, HeapAllocator>& otherVector = other; |
| 1675 Vector<T, inlineCapacity, HeapAllocator>::appendVector(otherVector); | 1681 Vector<T, inlineCapacity, HeapAllocator>::appendVector(otherVector); |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2396 template<typename T, size_t inlineCapacity> | 2402 template<typename T, size_t inlineCapacity> |
| 2397 struct GCInfoTrait<HeapVector<T, inlineCapacity>> : public GCInfoTrait<Vector<T,
inlineCapacity, HeapAllocator>> { }; | 2403 struct GCInfoTrait<HeapVector<T, inlineCapacity>> : public GCInfoTrait<Vector<T,
inlineCapacity, HeapAllocator>> { }; |
| 2398 template<typename T, size_t inlineCapacity> | 2404 template<typename T, size_t inlineCapacity> |
| 2399 struct GCInfoTrait<HeapDeque<T, inlineCapacity>> : public GCInfoTrait<Deque<T, i
nlineCapacity, HeapAllocator>> { }; | 2405 struct GCInfoTrait<HeapDeque<T, inlineCapacity>> : public GCInfoTrait<Deque<T, i
nlineCapacity, HeapAllocator>> { }; |
| 2400 template<typename T, typename U, typename V> | 2406 template<typename T, typename U, typename V> |
| 2401 struct GCInfoTrait<HeapHashCountedSet<T, U, V>> : public GCInfoTrait<HashCounted
Set<T, U, V, HeapAllocator>> { }; | 2407 struct GCInfoTrait<HeapHashCountedSet<T, U, V>> : public GCInfoTrait<HashCounted
Set<T, U, V, HeapAllocator>> { }; |
| 2402 | 2408 |
| 2403 } // namespace blink | 2409 } // namespace blink |
| 2404 | 2410 |
| 2405 #endif // Heap_h | 2411 #endif // Heap_h |
| OLD | NEW |