diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/html/canvas/Uint16Array.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/html/canvas/Uint16Array.h')
| -rw-r--r-- | WebCore/html/canvas/Uint16Array.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/html/canvas/Uint16Array.h b/WebCore/html/canvas/Uint16Array.h index fee31f6..f63b67d 100644 --- a/WebCore/html/canvas/Uint16Array.h +++ b/WebCore/html/canvas/Uint16Array.h @@ -34,7 +34,7 @@ namespace WebCore { class ArrayBuffer; class Uint16Array : public IntegralTypedArrayBase<unsigned short> { - public: +public: static PassRefPtr<Uint16Array> create(unsigned length); static PassRefPtr<Uint16Array> create(unsigned short* array, unsigned length); static PassRefPtr<Uint16Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length); @@ -42,7 +42,10 @@ class Uint16Array : public IntegralTypedArrayBase<unsigned short> { using TypedArrayBase<unsigned short>::set; using IntegralTypedArrayBase<unsigned short>::set; - private: + PassRefPtr<Uint16Array> slice(int start) const; + PassRefPtr<Uint16Array> slice(int start, int end) const; + +private: Uint16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length); @@ -51,7 +54,6 @@ class Uint16Array : public IntegralTypedArrayBase<unsigned short> { // Overridden from ArrayBufferView. virtual bool isUnsignedShortArray() const { return true; } - virtual PassRefPtr<ArrayBufferView> slice(int start, int end) const; }; } // namespace WebCore |