| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkTArray_DEFINED | 8 #ifndef SkTArray_DEFINED |
| 9 #define SkTArray_DEFINED | 9 #define SkTArray_DEFINED |
| 10 | 10 |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 } | 479 } |
| 480 | 480 |
| 481 SkSTArray(const SkSTArray& array) | 481 SkSTArray(const SkSTArray& array) |
| 482 : INHERITED(array, &fStorage) { | 482 : INHERITED(array, &fStorage) { |
| 483 } | 483 } |
| 484 | 484 |
| 485 explicit SkSTArray(const INHERITED& array) | 485 explicit SkSTArray(const INHERITED& array) |
| 486 : INHERITED(array, &fStorage) { | 486 : INHERITED(array, &fStorage) { |
| 487 } | 487 } |
| 488 | 488 |
| 489 explicit SkSTArray(int reserveCount) |
| 490 : INHERITED(reserveCount) { |
| 491 } |
| 492 |
| 489 SkSTArray(const T* array, int count) | 493 SkSTArray(const T* array, int count) |
| 490 : INHERITED(array, count, &fStorage) { | 494 : INHERITED(array, count, &fStorage) { |
| 491 } | 495 } |
| 492 | 496 |
| 493 SkSTArray& operator= (const SkSTArray& array) { | 497 SkSTArray& operator= (const SkSTArray& array) { |
| 494 return *this = *(const INHERITED*)&array; | 498 return *this = *(const INHERITED*)&array; |
| 495 } | 499 } |
| 496 | 500 |
| 497 SkSTArray& operator= (const INHERITED& array) { | 501 SkSTArray& operator= (const INHERITED& array) { |
| 498 INHERITED::operator=(array); | 502 INHERITED::operator=(array); |
| 499 return *this; | 503 return *this; |
| 500 } | 504 } |
| 501 | 505 |
| 502 private: | 506 private: |
| 503 SkAlignedSTStorage<N,T> fStorage; | 507 SkAlignedSTStorage<N,T> fStorage; |
| 504 }; | 508 }; |
| 505 | 509 |
| 506 #endif | 510 #endif |
| OLD | NEW |