diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/canvas/Uint32Array.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/canvas/Uint32Array.cpp')
| -rw-r--r-- | Source/WebCore/html/canvas/Uint32Array.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/WebCore/html/canvas/Uint32Array.cpp b/Source/WebCore/html/canvas/Uint32Array.cpp index f5bd959..621b53c 100644 --- a/Source/WebCore/html/canvas/Uint32Array.cpp +++ b/Source/WebCore/html/canvas/Uint32Array.cpp @@ -25,9 +25,6 @@ */ #include "config.h" - -#if ENABLE(3D_CANVAS) || ENABLE(BLOB) - #include "Uint32Array.h" namespace WebCore { @@ -52,16 +49,14 @@ Uint32Array::Uint32Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, un { } -PassRefPtr<Uint32Array> Uint32Array::slice(int start) const +PassRefPtr<Uint32Array> Uint32Array::subarray(int start) const { - return slice(start, length()); + return subarray(start, length()); } -PassRefPtr<Uint32Array> Uint32Array::slice(int start, int end) const +PassRefPtr<Uint32Array> Uint32Array::subarray(int start, int end) const { - return sliceImpl<Uint32Array>(start, end); + return subarrayImpl<Uint32Array>(start, end); } } - -#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB) |