diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/html/canvas/Int32Array.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/html/canvas/Int32Array.h')
| -rw-r--r-- | WebCore/html/canvas/Int32Array.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/html/canvas/Int32Array.h b/WebCore/html/canvas/Int32Array.h index 72fb579..bd05450 100644 --- a/WebCore/html/canvas/Int32Array.h +++ b/WebCore/html/canvas/Int32Array.h @@ -37,8 +37,10 @@ class Int32Array : public IntegralTypedArrayBase<int> { static PassRefPtr<Int32Array> create(int* array, unsigned length); static PassRefPtr<Int32Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length); +#if !COMPILER(RVCT) using TypedArrayBase<int>::set; using IntegralTypedArrayBase<int>::set; +#endif private: Int32Array(PassRefPtr<ArrayBuffer> buffer, |