diff options
author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/html/canvas/WebGLIntArray.h | |
parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/html/canvas/WebGLIntArray.h')
-rw-r--r-- | WebCore/html/canvas/WebGLIntArray.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/html/canvas/WebGLIntArray.h b/WebCore/html/canvas/WebGLIntArray.h index 25108ac..5929e75 100644 --- a/WebCore/html/canvas/WebGLIntArray.h +++ b/WebCore/html/canvas/WebGLIntArray.h @@ -41,13 +41,13 @@ class WebGLIntArray : public WebGLArray { static PassRefPtr<WebGLIntArray> create(unsigned length); static PassRefPtr<WebGLIntArray> create(int* array, unsigned length); - static PassRefPtr<WebGLIntArray> create(PassRefPtr<WebGLArrayBuffer> buffer, int byteOffset, unsigned length); + static PassRefPtr<WebGLIntArray> create(PassRefPtr<WebGLArrayBuffer> buffer, unsigned byteOffset, unsigned length); int* data() { return static_cast<int*>(baseAddress()); } virtual unsigned length() const; virtual unsigned byteLength() const; - virtual PassRefPtr<WebGLArray> slice(unsigned offset, unsigned length); + virtual PassRefPtr<WebGLArray> slice(int start, int end); void set(unsigned index, double value) { @@ -87,7 +87,7 @@ class WebGLIntArray : public WebGLArray { private: WebGLIntArray(PassRefPtr<WebGLArrayBuffer> buffer, - int byteOffset, + unsigned byteOffset, unsigned length); unsigned m_size; }; |