Changeset 97893 in webkit

Timestamp:

Oct 19, 2011 4:31:12 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

ArrayBuffer should have slice method.
​https://bugs.webkit.org/show_bug.cgi?id=66646

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-10-19
Reviewed by Kenneth Russell.

Source/WebCore:

• html/canvas/ArrayBuffer.cpp:

(WebCore::clampValue):
(WebCore::ArrayBuffer::slice):
(WebCore::ArrayBuffer::sliceImpl):
(WebCore::ArrayBuffer::clampIndex):

• html/canvas/ArrayBuffer.h: Added declaration.
• html/canvas/ArrayBuffer.idl: Added interface.

LayoutTests:

• fast/canvas/webgl/array-unit-tests.html: Aded.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/array-unit-tests.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/ArrayBuffer.cpp (modified) (2 diffs)
• Source/WebCore/html/canvas/ArrayBuffer.h (modified) (2 diffs)
• Source/WebCore/html/canvas/ArrayBuffer.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-19  Shinya Kawanaka  <shinyak@google.com>
+
+        ArrayBuffer should have slice method.
+        https://bugs.webkit.org/show_bug.cgi?id=66646
+
+        Reviewed by Kenneth Russell.
+
+        * fast/canvas/webgl/array-unit-tests.html: Aded.
+
 2011-10-19  Dirk Pranke  <dpranke@chromium.org>
 

trunk/LayoutTests/fast/canvas/webgl/array-unit-tests.html

@@ -55 +55 @@
   } else {
     debug("TEST FAILED");
+  }
+}
+
+var byteLength;
+var subBuffer;
+function testSlice() {
+  function test(subBuf, starts, size) {
+    byteLength = size;
+    subBuffer = eval(subBuf);
+    var subArray = new Int8Array(subBuffer);
+    assertEq(subBuf, subBuffer.byteLength, byteLength);
+    for (var i = 0; i < size; ++i)
+      assertEq('Element ' + i, starts + i, subArray[i]);
+  }
+
+  try {
+    var buffer = new ArrayBuffer(32);
+    var array = new Int8Array(buffer);
+    for (var i = 0; i < 32; ++i)
+      array[i] = i;
+
+    test("buffer.slice(0)", 0, 32);
+    test("buffer.slice(16)", 16, 16);
+    test("buffer.slice(24)", 24, 8);
+    test("buffer.slice(32)", 32, 0);
+    test("buffer.slice(40)", 32, 0);
+    test("buffer.slice(80)", 32, 0);
+
+    test("buffer.slice(-8)", 24, 8);
+    test("buffer.slice(-16)", 16, 16);
+    test("buffer.slice(-24)", 8, 24);
+    test("buffer.slice(-32)", 0, 32);
+    test("buffer.slice(-40)", 0, 32);
+    test("buffer.slice(-80)", 0, 32);
+
+    test("buffer.slice(0, 32)", 0, 32);
+    test("buffer.slice(0, 16)", 0, 16);
+    test("buffer.slice(8, 24)", 8, 16);
+    test("buffer.slice(16, 32)", 16, 16);
+    test("buffer.slice(24, 16)", 24, 0);
+
+    test("buffer.slice(16, -8)", 16, 8);
+    test("buffer.slice(-20, 30)", 12, 18);
+
+    test("buffer.slice(-8, -20)", 24, 0);
+    test("buffer.slice(-20, -8)", 12, 12);
+    test("buffer.slice(-40, 16)", 0, 16);
+    test("buffer.slice(-40, 40)", 0, 32);
+  } catch (e) {
+    fail(e);
   }
 }
@@ -825 +875 @@
 function runTests() {
   allPassed = true;
+
+  testSlice();
 
   // The "name" attribute is a concession to browsers which don't

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-19  Shinya Kawanaka  <shinyak@google.com>
+
+        ArrayBuffer should have slice method.
+        https://bugs.webkit.org/show_bug.cgi?id=66646
+
+        Reviewed by Kenneth Russell.
+
+        * html/canvas/ArrayBuffer.cpp:
+        (WebCore::clampValue):
+        (WebCore::ArrayBuffer::slice):
+        (WebCore::ArrayBuffer::sliceImpl):
+        (WebCore::ArrayBuffer::clampIndex):
+        * html/canvas/ArrayBuffer.h: Added declaration.
+        * html/canvas/ArrayBuffer.idl: Added interface.
+
 2011-10-19  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebCore/html/canvas/ArrayBuffer.cpp

@@ -30 +30 @@
 
 namespace WebCore {
+
+static int clampValue(int x, int left, int right)
+{
+    ASSERT(left <= right);
+    if (x < left)
+        x = left;
+    if (right < x)
+        x = right;
+    return x;
+}
 
 PassRefPtr<ArrayBuffer> ArrayBuffer::create(unsigned numElements, unsigned elementByteSize)
@@ -75 +85 @@
 }
 
+PassRefPtr<ArrayBuffer> ArrayBuffer::slice(int begin, int end) const
+{
+    return sliceImpl(clampIndex(begin), clampIndex(end));
+}
+
+PassRefPtr<ArrayBuffer> ArrayBuffer::slice(int begin) const
+{
+    return sliceImpl(clampIndex(begin), byteLength());
+}
+
+PassRefPtr<ArrayBuffer> ArrayBuffer::sliceImpl(unsigned begin, unsigned end) const
+{
+    unsigned size = begin <= end ? end - begin : 0;
+    return ArrayBuffer::create(static_cast<const char*>(data()) + begin, size);
+}
+
+unsigned ArrayBuffer::clampIndex(int index) const
+{
+    unsigned currentLength = byteLength();
+    if (index < 0)
+        index = currentLength + index;
+    return clampValue(index, 0, currentLength);
+}
+
 ArrayBuffer::~ArrayBuffer()
 {

trunk/Source/WebCore/html/canvas/ArrayBuffer.h

@@ -42 +42 @@
     unsigned byteLength() const;
 
+    PassRefPtr<ArrayBuffer> slice(int begin, int end) const;
+    PassRefPtr<ArrayBuffer> slice(int begin) const;
+
     ~ArrayBuffer();
 
@@ -48 +51 @@
     ArrayBuffer(unsigned numElements, unsigned elementByteSize);
     static void* tryAllocate(unsigned numElements, unsigned elementByteSize);
+    PassRefPtr<ArrayBuffer> sliceImpl(unsigned begin, unsigned end) const;
+    unsigned clampIndex(int index) const;
+
     unsigned m_sizeInBytes;
     void* m_data;

trunk/Source/WebCore/html/canvas/ArrayBuffer.idl

@@ -33 +33 @@
     ] ArrayBuffer {
         readonly attribute int byteLength;
+        ArrayBuffer slice(in long begin, in [Optional] long end);
     };