[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
kbr at google.com
kbr at google.com
Mon Feb 21 00:40:38 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 5a0aca35a050592fe16e7e2fbafab1d268443994
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 2 21:37:00 2011 +0000
2011-02-02 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
Rename Typed Array subset to subarray
https://bugs.webkit.org/show_bug.cgi?id=53618
* fast/canvas/webgl/array-setters.html:
* fast/canvas/webgl/array-unit-tests-expected.txt:
* fast/canvas/webgl/array-unit-tests.html:
* fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt:
* fast/canvas/webgl/draw-elements-out-of-bounds.html:
* fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt:
* fast/canvas/webgl/webgl-array-invalid-ranges.html:
2011-02-02 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
Rename Typed Array subset to subarray
https://bugs.webkit.org/show_bug.cgi?id=53618
* html/canvas/Float32Array.cpp:
(WebCore::Float32Array::subarray):
* html/canvas/Float32Array.h:
* html/canvas/Float32Array.idl:
* html/canvas/Int16Array.cpp:
(WebCore::Int16Array::subarray):
* html/canvas/Int16Array.h:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.cpp:
(WebCore::Int32Array::subarray):
* html/canvas/Int32Array.h:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.cpp:
(WebCore::Int8Array::subarray):
* html/canvas/Int8Array.h:
* html/canvas/Int8Array.idl:
* html/canvas/TypedArrayBase.h:
(WebCore::TypedArrayBase::subarrayImpl):
* html/canvas/Uint16Array.cpp:
(WebCore::Uint16Array::subarray):
* html/canvas/Uint16Array.h:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.cpp:
(WebCore::Uint32Array::subarray):
* html/canvas/Uint32Array.h:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.cpp:
(WebCore::Uint8Array::subarray):
* html/canvas/Uint8Array.h:
* html/canvas/Uint8Array.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6d3ba00..70e9b8e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2011-02-02 Kenneth Russell <kbr at google.com>
+
+ Reviewed by James Robinson.
+
+ Rename Typed Array subset to subarray
+ https://bugs.webkit.org/show_bug.cgi?id=53618
+
+ * fast/canvas/webgl/array-setters.html:
+ * fast/canvas/webgl/array-unit-tests-expected.txt:
+ * fast/canvas/webgl/array-unit-tests.html:
+ * fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt:
+ * fast/canvas/webgl/draw-elements-out-of-bounds.html:
+ * fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt:
+ * fast/canvas/webgl/webgl-array-invalid-ranges.html:
+
2011-02-02 Dimitri Glazkov <dglazkov at chromium.org>
Added GPU fails from bots.
diff --git a/LayoutTests/fast/canvas/webgl/array-setters.html b/LayoutTests/fast/canvas/webgl/array-setters.html
index d58a6f6..58e6f52 100644
--- a/LayoutTests/fast/canvas/webgl/array-setters.html
+++ b/LayoutTests/fast/canvas/webgl/array-setters.html
@@ -38,7 +38,7 @@ function testSetters(typeName, low, high) {
array = [0, 1, 2, 3, 4, 5];
webGLArray = new type(6);
webGLArray.set(array);
- array = webGLArray.subset(2, 4);
+ array = webGLArray.subarray(2, 4);
array[0] = 88;
array[1] = 99;
shouldBe("webGLArray[2]", "88");
diff --git a/LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt b/LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt
index 831edc5..451d4cf 100644
--- a/LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt
@@ -14,8 +14,8 @@ PASS test Float32Array SetFromTypedArray
PASS negativeTest Float32Array SetFromTypedArray
PASS test Float32Array SetFromArray
PASS negativeTest Float32Array SetFromArray
-PASS test Float32Array Subset
-PASS negativeTest Float32Array Subset
+PASS test Float32Array Subarray
+PASS negativeTest Float32Array Subarray
PASS test Float32Array BoundaryConditions(-500.5, -500.5, 500.5, 500.5)
PASS Construction of Float32Array with null buffer threw exception
PASS Construction of Float32Array with (null buffer, 0) threw exception
@@ -28,17 +28,17 @@ PASS Construction of Float32Array with unaligned offset threw an exception
PASS Construction of Float32Array with unaligned length threw an exception
PASS Construction of huge Float32Array threw exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Float32Array
+Testing subarray of Float32Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS array.length is 0
-Testing subsetting with default inputs of Float32Array
+Testing subarray with default inputs of Float32Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Float32Array from array with out-of-range offset was caught
PASS Setting Float32Array from fake array with invalid length was caught
PASS Setting Float32Array from Float32Array with out-of-range offset was caught
@@ -57,8 +57,8 @@ PASS test Int8Array SetFromTypedArray
PASS negativeTest Int8Array SetFromTypedArray
PASS test Int8Array SetFromArray
PASS negativeTest Int8Array SetFromArray
-PASS test Int8Array Subset
-PASS negativeTest Int8Array Subset
+PASS test Int8Array Subarray
+PASS negativeTest Int8Array Subarray
PASS test Int8Array BoundaryConditions(-128, -128, 127, 127)
PASS Construction of Int8Array with null buffer threw exception
PASS Construction of Int8Array with (null buffer, 0) threw exception
@@ -68,16 +68,16 @@ PASS Construction of ArrayBuffer with negative size threw exception
PASS Construction of Int8Array with negative size threw exception
PASS Construction of Int8Array with negative out-of-range values threw an exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Int8Array
+Testing subarray of Int8Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
-Testing subsetting with default inputs of Int8Array
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
+Testing subarray with default inputs of Int8Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Int8Array from array with out-of-range offset was caught
PASS Setting Int8Array from fake array with invalid length was caught
PASS Setting Int8Array from Int8Array with out-of-range offset was caught
@@ -96,8 +96,8 @@ PASS test Int16Array SetFromTypedArray
PASS negativeTest Int16Array SetFromTypedArray
PASS test Int16Array SetFromArray
PASS negativeTest Int16Array SetFromArray
-PASS test Int16Array Subset
-PASS negativeTest Int16Array Subset
+PASS test Int16Array Subarray
+PASS negativeTest Int16Array Subarray
PASS test Int16Array BoundaryConditions(-32768, -32768, 32767, 32767)
PASS Construction of Int16Array with null buffer threw exception
PASS Construction of Int16Array with (null buffer, 0) threw exception
@@ -110,17 +110,17 @@ PASS Construction of Int16Array with unaligned offset threw an exception
PASS Construction of Int16Array with unaligned length threw an exception
PASS Construction of huge Int16Array threw exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Int16Array
+Testing subarray of Int16Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS array.length is 0
-Testing subsetting with default inputs of Int16Array
+Testing subarray with default inputs of Int16Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Int16Array from array with out-of-range offset was caught
PASS Setting Int16Array from fake array with invalid length was caught
PASS Setting Int16Array from Int16Array with out-of-range offset was caught
@@ -139,8 +139,8 @@ PASS test Int32Array SetFromTypedArray
PASS negativeTest Int32Array SetFromTypedArray
PASS test Int32Array SetFromArray
PASS negativeTest Int32Array SetFromArray
-PASS test Int32Array Subset
-PASS negativeTest Int32Array Subset
+PASS test Int32Array Subarray
+PASS negativeTest Int32Array Subarray
PASS test Int32Array BoundaryConditions(-2147483648, -2147483648, 2147483647, 2147483647)
PASS Construction of Int32Array with null buffer threw exception
PASS Construction of Int32Array with (null buffer, 0) threw exception
@@ -153,17 +153,17 @@ PASS Construction of Int32Array with unaligned offset threw an exception
PASS Construction of Int32Array with unaligned length threw an exception
PASS Construction of huge Int32Array threw exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Int32Array
+Testing subarray of Int32Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS array.length is 0
-Testing subsetting with default inputs of Int32Array
+Testing subarray with default inputs of Int32Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Int32Array from array with out-of-range offset was caught
PASS Setting Int32Array from fake array with invalid length was caught
PASS Setting Int32Array from Int32Array with out-of-range offset was caught
@@ -182,8 +182,8 @@ PASS test Uint8Array SetFromTypedArray
PASS negativeTest Uint8Array SetFromTypedArray
PASS test Uint8Array SetFromArray
PASS negativeTest Uint8Array SetFromArray
-PASS test Uint8Array Subset
-PASS negativeTest Uint8Array Subset
+PASS test Uint8Array Subarray
+PASS negativeTest Uint8Array Subarray
PASS test Uint8Array BoundaryConditions(0, 0, 255, 255)
PASS Construction of Uint8Array with null buffer threw exception
PASS Construction of Uint8Array with (null buffer, 0) threw exception
@@ -193,16 +193,16 @@ PASS Construction of ArrayBuffer with negative size threw exception
PASS Construction of Uint8Array with negative size threw exception
PASS Construction of Uint8Array with negative out-of-range values threw an exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Uint8Array
+Testing subarray of Uint8Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
-Testing subsetting with default inputs of Uint8Array
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
+Testing subarray with default inputs of Uint8Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Uint8Array from array with out-of-range offset was caught
PASS Setting Uint8Array from fake array with invalid length was caught
PASS Setting Uint8Array from Uint8Array with out-of-range offset was caught
@@ -221,8 +221,8 @@ PASS test Uint16Array SetFromTypedArray
PASS negativeTest Uint16Array SetFromTypedArray
PASS test Uint16Array SetFromArray
PASS negativeTest Uint16Array SetFromArray
-PASS test Uint16Array Subset
-PASS negativeTest Uint16Array Subset
+PASS test Uint16Array Subarray
+PASS negativeTest Uint16Array Subarray
PASS test Uint16Array BoundaryConditions(0, 0, 65535, 65535)
PASS Construction of Uint16Array with null buffer threw exception
PASS Construction of Uint16Array with (null buffer, 0) threw exception
@@ -235,17 +235,17 @@ PASS Construction of Uint16Array with unaligned offset threw an exception
PASS Construction of Uint16Array with unaligned length threw an exception
PASS Construction of huge Uint16Array threw exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Uint16Array
+Testing subarray of Uint16Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS array.length is 0
-Testing subsetting with default inputs of Uint16Array
+Testing subarray with default inputs of Uint16Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Uint16Array from array with out-of-range offset was caught
PASS Setting Uint16Array from fake array with invalid length was caught
PASS Setting Uint16Array from Uint16Array with out-of-range offset was caught
@@ -264,8 +264,8 @@ PASS test Uint32Array SetFromTypedArray
PASS negativeTest Uint32Array SetFromTypedArray
PASS test Uint32Array SetFromArray
PASS negativeTest Uint32Array SetFromArray
-PASS test Uint32Array Subset
-PASS negativeTest Uint32Array Subset
+PASS test Uint32Array Subarray
+PASS negativeTest Uint32Array Subarray
PASS test Uint32Array BoundaryConditions(0, 0, 4294967295, 4294967295)
PASS Construction of Uint32Array with null buffer threw exception
PASS Construction of Uint32Array with (null buffer, 0) threw exception
@@ -278,17 +278,17 @@ PASS Construction of Uint32Array with unaligned offset threw an exception
PASS Construction of Uint32Array with unaligned length threw an exception
PASS Construction of huge Uint32Array threw exception
PASS Array lengths matched with explicit and implicit creation of ArrayBuffer
-Testing subsetting of Uint32Array
+Testing subarray of Uint32Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS array.length is 0
-Testing subsetting with default inputs of Uint32Array
+Testing subarray with default inputs of Uint32Array
PASS array.length is 32 / typeSize
-PASS array.subset(0).length is (32 / typeSize)
-PASS array.subset(2).length is (32 / typeSize) - 2
-PASS array.subset(-2).length is 2
-PASS array.subset(-2147483648).length is (32 / typeSize)
+PASS array.subarray(0).length is (32 / typeSize)
+PASS array.subarray(2).length is (32 / typeSize) - 2
+PASS array.subarray(-2).length is 2
+PASS array.subarray(-2147483648).length is (32 / typeSize)
PASS Setting Uint32Array from array with out-of-range offset was caught
PASS Setting Uint32Array from fake array with invalid length was caught
PASS Setting Uint32Array from Uint32Array with out-of-range offset was caught
diff --git a/LayoutTests/fast/canvas/webgl/array-unit-tests.html b/LayoutTests/fast/canvas/webgl/array-unit-tests.html
index 6951f78..571ba11 100644
--- a/LayoutTests/fast/canvas/webgl/array-unit-tests.html
+++ b/LayoutTests/fast/canvas/webgl/array-unit-tests.html
@@ -284,19 +284,19 @@ function negativeTestSetFromArray(type, name) {
}
}
-function testSubset(type, name) {
- running('test ' + name + ' Subset');
+function testSubarray(type, name) {
+ running('test ' + name + ' Subarray');
try {
var array = new type([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
- var subset = array.subset(0, 5);
- assertEq('subset.length', 5, subset.length);
+ var subarray = array.subarray(0, 5);
+ assertEq('subarray.length', 5, subarray.length);
for (var i = 0; i < 5; i++) {
- assertEq('Element ' + i, i, subset[i]);
+ assertEq('Element ' + i, i, subarray[i]);
}
- subset = array.subset(4, 10);
- assertEq('subset.length', 6, subset.length);
+ subarray = array.subarray(4, 10);
+ assertEq('subarray.length', 6, subarray.length);
for (var i = 0; i < 6; i++) {
- assertEq('Element ' + i, 4 + i, subset[i]);
+ assertEq('Element ' + i, 4 + i, subarray[i]);
}
pass();
} catch (e) {
@@ -304,17 +304,17 @@ function testSubset(type, name) {
}
}
-function negativeTestSubset(type, name) {
- running('negativeTest ' + name + ' Subset');
+function negativeTestSubarray(type, name) {
+ running('negativeTest ' + name + ' Subarray');
try {
var array = new type([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
- subset = array.subset(5, 11);
- if (subset.length != 5) {
+ subarray = array.subarray(5, 11);
+ if (subarray.length != 5) {
fail();
return;
}
- subset = array.subset(10, 10);
- if (subset.length != 0) {
+ subarray = array.subarray(10, 10);
+ if (subarray.length != 0) {
fail();
return;
}
@@ -446,48 +446,48 @@ function testConstructionWithBothArrayBufferAndLength(type, name, elementSizeInB
var array;
var typeSize;
-function testSubsettingWithOutOfRangeValues(type, name, sz) {
- debug("Testing subsetting of " + name);
+function testSubarrayWithOutOfRangeValues(type, name, sz) {
+ debug("Testing subarray of " + name);
try {
var buffer = new ArrayBuffer(32);
array = new type(buffer);
typeSize = sz;
shouldBe("array.length", "32 / typeSize");
try {
- shouldBe("array.subset(4, 0x3FFFFFFF).length", "(32 / typeSize) - 4");
- shouldBe("array.subset(4, -2147483648).length", "0");
- // Test subset() against overflows.
- array = array.subset(2);
+ shouldBe("array.subarray(4, 0x3FFFFFFF).length", "(32 / typeSize) - 4");
+ shouldBe("array.subarray(4, -2147483648).length", "0");
+ // Test subarray() against overflows.
+ array = array.subarray(2);
if (sz > 1) {
// Full byte offset is +1 larger than the maximum unsigned long int.
- // Make sure subset() still handles it correctly. Otherwise overflow would happen and
+ // Make sure subarray() still handles it correctly. Otherwise overflow would happen and
// offset would be 0, and array.length array.length would incorrectly be 1.
var start = 4294967296 / sz - 2;
- array = array.subset(start, start + 1);
+ array = array.subarray(start, start + 1);
shouldBe("array.length", "0");
}
} catch (e) {
- testFailed("Subsetting of " + name + " threw exception");
+ testFailed("Subarray of " + name + " threw exception");
}
} catch (e) {
testFailed("Exception: " + e);
}
}
-function testSubsettingWithDefaultValues(type, name, sz) {
- debug("Testing subsetting with default inputs of " + name);
+function testSubarrayWithDefaultValues(type, name, sz) {
+ debug("Testing subarray with default inputs of " + name);
try {
var buffer = new ArrayBuffer(32);
array = new type(buffer);
typeSize = sz;
shouldBe("array.length", "32 / typeSize");
try {
- shouldBe("array.subset(0).length", "(32 / typeSize)");
- shouldBe("array.subset(2).length", "(32 / typeSize) - 2");
- shouldBe("array.subset(-2).length", "2");
- shouldBe("array.subset(-2147483648).length", "(32 / typeSize)");
+ shouldBe("array.subarray(0).length", "(32 / typeSize)");
+ shouldBe("array.subarray(2).length", "(32 / typeSize) - 2");
+ shouldBe("array.subarray(-2).length", "2");
+ shouldBe("array.subarray(-2147483648).length", "(32 / typeSize)");
} catch (e) {
- testFailed("Subsetting of " + name + " threw exception");
+ testFailed("Subarray of " + name + " threw exception");
}
} catch (e) {
testFailed("Exception: " + e);
@@ -713,8 +713,8 @@ function runTests() {
negativeTestSetFromTypedArray(type, name);
testSetFromArray(type, name);
negativeTestSetFromArray(type, name);
- testSubset(type, name);
- negativeTestSubset(type, name);
+ testSubarray(type, name);
+ negativeTestSubarray(type, name);
testBoundaryConditions(type,
name,
testCase.low,
@@ -728,8 +728,8 @@ function runTests() {
testConstructionWithUnalignedLength(type, name, testCase.elementSizeInBytes);
testConstructionOfHugeArray(type, name, testCase.elementSizeInBytes);
testConstructionWithBothArrayBufferAndLength(type, name, testCase.elementSizeInBytes);
- testSubsettingWithOutOfRangeValues(type, name, testCase.elementSizeInBytes);
- testSubsettingWithDefaultValues(type, name, testCase.elementSizeInBytes);
+ testSubarrayWithOutOfRangeValues(type, name, testCase.elementSizeInBytes);
+ testSubarrayWithDefaultValues(type, name, testCase.elementSizeInBytes);
testSettingFromArrayWithOutOfRangeOffset(type, name);
testSettingFromFakeArrayWithOutOfRangeLength(type, name);
testSettingFromTypedArrayWithOutOfRangeOffset(type, name);
diff --git a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt b/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt
index a70f048..35d5026 100644
--- a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt
@@ -28,11 +28,11 @@ PASS context.drawElements(context.TRIANGLES, 0, context.UNSIGNED_BYTE, 4) genera
PASS context.drawElements(context.TRIANGLES, 0xffffffff, context.UNSIGNED_BYTE, 0) generated expected GL error: INVALID_VALUE.
PASS context.drawElements(context.TRIANGLES, 0x7fffffff, context.UNSIGNED_BYTE, 0) generated expected GL error: INVALID_OPERATION.
PASS context.drawElements(context.TRIANGLES, 0x7fffffff, context.UNSIGNED_BYTE, 0x7fffffff) generated expected GL error: INVALID_OPERATION.
-PASS context.bufferData(context.ELEMENT_ARRAY_BUFFER, (new Uint8Array([ 3, 0, 1, 2 ])).subset(1), context.STATIC_DRAW) generated expected GL error: NO_ERROR.
+PASS context.bufferData(context.ELEMENT_ARRAY_BUFFER, (new Uint8Array([ 3, 0, 1, 2 ])).subarray(1), context.STATIC_DRAW) generated expected GL error: NO_ERROR.
PASS context.drawElements(context.TRIANGLES, 3, context.UNSIGNED_BYTE, 0) generated expected GL error: NO_ERROR.
PASS context.bufferSubData(context.ELEMENT_ARRAY_BUFFER, 0, new Uint8Array([ 3, 0, 1])) generated expected GL error: NO_ERROR.
PASS context.drawElements(context.TRIANGLES, 3, context.UNSIGNED_BYTE, 0) generated expected GL error: INVALID_OPERATION.
-PASS context.bufferSubData(context.ELEMENT_ARRAY_BUFFER, 0, (new Uint8Array([ 3, 0, 1, 2 ])).subset(1)) generated expected GL error: NO_ERROR.
+PASS context.bufferSubData(context.ELEMENT_ARRAY_BUFFER, 0, (new Uint8Array([ 3, 0, 1, 2 ])).subarray(1)) generated expected GL error: NO_ERROR.
PASS context.drawElements(context.TRIANGLES, 3, context.UNSIGNED_BYTE, 0) generated expected GL error: NO_ERROR.
PASS context.drawElements(context.TRIANGLES, 0, context.UNSIGNED_BYTE, 0) generated expected GL error: NO_ERROR.
diff --git a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html b/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html
index b509d00..5632046 100644
--- a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html
+++ b/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html
@@ -55,11 +55,11 @@ shouldGenerateGLError(context, context.INVALID_VALUE, "context.drawElements(cont
shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawElements(context.TRIANGLES, 0x7fffffff, context.UNSIGNED_BYTE, 0)");
shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawElements(context.TRIANGLES, 0x7fffffff, context.UNSIGNED_BYTE, 0x7fffffff)");
-shouldGenerateGLError(context, context.NO_ERROR, "context.bufferData(context.ELEMENT_ARRAY_BUFFER, (new Uint8Array([ 3, 0, 1, 2 ])).subset(1), context.STATIC_DRAW)");
+shouldGenerateGLError(context, context.NO_ERROR, "context.bufferData(context.ELEMENT_ARRAY_BUFFER, (new Uint8Array([ 3, 0, 1, 2 ])).subarray(1), context.STATIC_DRAW)");
shouldGenerateGLError(context, context.NO_ERROR, "context.drawElements(context.TRIANGLES, 3, context.UNSIGNED_BYTE, 0)");
shouldGenerateGLError(context, context.NO_ERROR, "context.bufferSubData(context.ELEMENT_ARRAY_BUFFER, 0, new Uint8Array([ 3, 0, 1]))");
shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawElements(context.TRIANGLES, 3, context.UNSIGNED_BYTE, 0)");
-shouldGenerateGLError(context, context.NO_ERROR, "context.bufferSubData(context.ELEMENT_ARRAY_BUFFER, 0, (new Uint8Array([ 3, 0, 1, 2 ])).subset(1))");
+shouldGenerateGLError(context, context.NO_ERROR, "context.bufferSubData(context.ELEMENT_ARRAY_BUFFER, 0, (new Uint8Array([ 3, 0, 1, 2 ])).subarray(1))");
shouldGenerateGLError(context, context.NO_ERROR, "context.drawElements(context.TRIANGLES, 3, context.UNSIGNED_BYTE, 0)");
shouldGenerateGLError(context, context.NO_ERROR, "context.drawElements(context.TRIANGLES, 0, context.UNSIGNED_BYTE, 0)");
diff --git a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt b/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt
index 205c903..cd6d27b 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt
@@ -5,20 +5,20 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS Construction of Int8Array with null buffer threw exception
PASS Construction of Int8Array with out-of-range values threw exception
PASS Construction of Int8Array with negative out-of-range values threw exception
-Testing slicing of Int8Array
+Testing subarray of Int8Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Int8Array from array with out-of-range offset was caught
PASS Setting Int8Array from fake array with invalid length was caught
PASS Setting Int8Array from Int8Array with out-of-range offset was caught
PASS Construction of Uint8Array with null buffer threw exception
PASS Construction of Uint8Array with out-of-range values threw exception
PASS Construction of Uint8Array with negative out-of-range values threw exception
-Testing slicing of Uint8Array
+Testing subarray of Uint8Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Uint8Array from array with out-of-range offset was caught
PASS Setting Uint8Array from fake array with invalid length was caught
PASS Setting Uint8Array from Uint8Array with out-of-range offset was caught
@@ -26,10 +26,10 @@ PASS Construction of Int16Array with null buffer threw exception
PASS Construction of Int16Array with out-of-range values threw exception
PASS Construction of Int16Array with negative out-of-range values threw exception
PASS Construction of huge Int16Array threw exception
-Testing slicing of Int16Array
+Testing subarray of Int16Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Int16Array from array with out-of-range offset was caught
PASS Setting Int16Array from fake array with invalid length was caught
PASS Setting Int16Array from Int16Array with out-of-range offset was caught
@@ -37,10 +37,10 @@ PASS Construction of Uint16Array with null buffer threw exception
PASS Construction of Uint16Array with out-of-range values threw exception
PASS Construction of Uint16Array with negative out-of-range values threw exception
PASS Construction of huge Uint16Array threw exception
-Testing slicing of Uint16Array
+Testing subarray of Uint16Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Uint16Array from array with out-of-range offset was caught
PASS Setting Uint16Array from fake array with invalid length was caught
PASS Setting Uint16Array from Uint16Array with out-of-range offset was caught
@@ -48,10 +48,10 @@ PASS Construction of Int32Array with null buffer threw exception
PASS Construction of Int32Array with out-of-range values threw exception
PASS Construction of Int32Array with negative out-of-range values threw exception
PASS Construction of huge Int32Array threw exception
-Testing slicing of Int32Array
+Testing subarray of Int32Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Int32Array from array with out-of-range offset was caught
PASS Setting Int32Array from fake array with invalid length was caught
PASS Setting Int32Array from Int32Array with out-of-range offset was caught
@@ -59,10 +59,10 @@ PASS Construction of Uint32Array with null buffer threw exception
PASS Construction of Uint32Array with out-of-range values threw exception
PASS Construction of Uint32Array with negative out-of-range values threw exception
PASS Construction of huge Uint32Array threw exception
-Testing slicing of Uint32Array
+Testing subarray of Uint32Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Uint32Array from array with out-of-range offset was caught
PASS Setting Uint32Array from fake array with invalid length was caught
PASS Setting Uint32Array from Uint32Array with out-of-range offset was caught
@@ -70,10 +70,10 @@ PASS Construction of Float32Array with null buffer threw exception
PASS Construction of Float32Array with out-of-range values threw exception
PASS Construction of Float32Array with negative out-of-range values threw exception
PASS Construction of huge Float32Array threw exception
-Testing slicing of Float32Array
+Testing subarray of Float32Array
PASS array.length is 32 / typeSize
-PASS array.subset(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
-PASS array.subset(4, -2147483648).length is 0
+PASS array.subarray(4, 0x3FFFFFFF).length is (32 / typeSize) - 4
+PASS array.subarray(4, -2147483648).length is 0
PASS Setting Float32Array from array with out-of-range offset was caught
PASS Setting Float32Array from fake array with invalid length was caught
PASS Setting Float32Array from Float32Array with out-of-range offset was caught
diff --git a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html b/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html
index c6a8a18..1642816 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html
@@ -62,18 +62,18 @@ function testConstructionOfHugeArray(type, name, sz) {
var array;
var typeSize;
-function testSlicingWithOutOfRangeValues(type, name, sz) {
- debug("Testing slicing of " + name);
+function testSubarrayWithOutOfRangeValues(type, name, sz) {
+ debug("Testing subarray of " + name);
try {
var buffer = new ArrayBuffer(32);
array = new type(buffer);
typeSize = sz;
shouldBe("array.length", "32 / typeSize");
try {
- shouldBe("array.subset(4, 0x3FFFFFFF).length", "(32 / typeSize) - 4");
- shouldBe("array.subset(4, -2147483648).length", "0");
+ shouldBe("array.subarray(4, 0x3FFFFFFF).length", "(32 / typeSize) - 4");
+ shouldBe("array.subarray(4, -2147483648).length", "0");
} catch (e) {
- testFailed("Slicing of " + name + " threw exception");
+ testFailed("Subarray of " + name + " threw exception");
}
} catch (e) {
testFailed("Exception: " + e);
@@ -140,7 +140,7 @@ for (var i = 0; i < typeNames.length; i++) {
testConstructionWithOutOfRangeValues(type, name);
testConstructionWithNegativeOutOfRangeValues(type, name);
testConstructionOfHugeArray(type, name, typeSizes[i]);
- testSlicingWithOutOfRangeValues(type, name, typeSizes[i]);
+ testSubarrayWithOutOfRangeValues(type, name, typeSizes[i]);
testSettingFromArrayWithOutOfRangeOffset(type, name);
testSettingFromFakeArrayWithOutOfRangeLength(type, name);
testSettingFromWebGLArrayWithOutOfRangeOffset(type, name);
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a91da82..b94ed49 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,41 @@
+2011-02-02 Kenneth Russell <kbr at google.com>
+
+ Reviewed by James Robinson.
+
+ Rename Typed Array subset to subarray
+ https://bugs.webkit.org/show_bug.cgi?id=53618
+
+ * html/canvas/Float32Array.cpp:
+ (WebCore::Float32Array::subarray):
+ * html/canvas/Float32Array.h:
+ * html/canvas/Float32Array.idl:
+ * html/canvas/Int16Array.cpp:
+ (WebCore::Int16Array::subarray):
+ * html/canvas/Int16Array.h:
+ * html/canvas/Int16Array.idl:
+ * html/canvas/Int32Array.cpp:
+ (WebCore::Int32Array::subarray):
+ * html/canvas/Int32Array.h:
+ * html/canvas/Int32Array.idl:
+ * html/canvas/Int8Array.cpp:
+ (WebCore::Int8Array::subarray):
+ * html/canvas/Int8Array.h:
+ * html/canvas/Int8Array.idl:
+ * html/canvas/TypedArrayBase.h:
+ (WebCore::TypedArrayBase::subarrayImpl):
+ * html/canvas/Uint16Array.cpp:
+ (WebCore::Uint16Array::subarray):
+ * html/canvas/Uint16Array.h:
+ * html/canvas/Uint16Array.idl:
+ * html/canvas/Uint32Array.cpp:
+ (WebCore::Uint32Array::subarray):
+ * html/canvas/Uint32Array.h:
+ * html/canvas/Uint32Array.idl:
+ * html/canvas/Uint8Array.cpp:
+ (WebCore::Uint8Array::subarray):
+ * html/canvas/Uint8Array.h:
+ * html/canvas/Uint8Array.idl:
+
2011-02-02 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/Source/WebCore/html/canvas/Float32Array.cpp b/Source/WebCore/html/canvas/Float32Array.cpp
index 15c3ff6..e772595 100644
--- a/Source/WebCore/html/canvas/Float32Array.cpp
+++ b/Source/WebCore/html/canvas/Float32Array.cpp
@@ -52,14 +52,14 @@ Float32Array::Float32Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset,
{
}
-PassRefPtr<Float32Array> Float32Array::subset(int start) const
+PassRefPtr<Float32Array> Float32Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Float32Array> Float32Array::subset(int start, int end) const
+PassRefPtr<Float32Array> Float32Array::subarray(int start, int end) const
{
- return subsetImpl<Float32Array>(start, end);
+ return subarrayImpl<Float32Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Float32Array.h b/Source/WebCore/html/canvas/Float32Array.h
index 4c04138..ee1ea56 100644
--- a/Source/WebCore/html/canvas/Float32Array.h
+++ b/Source/WebCore/html/canvas/Float32Array.h
@@ -56,8 +56,8 @@ public:
return result;
}
- PassRefPtr<Float32Array> subset(int start) const;
- PassRefPtr<Float32Array> subset(int start, int end) const;
+ PassRefPtr<Float32Array> subarray(int start) const;
+ PassRefPtr<Float32Array> subarray(int start, int end) const;
private:
Float32Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Float32Array.idl b/Source/WebCore/html/canvas/Float32Array.idl
index b8a93e1..617d3a1 100644
--- a/Source/WebCore/html/canvas/Float32Array.idl
+++ b/Source/WebCore/html/canvas/Float32Array.idl
@@ -40,7 +40,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 4;
readonly attribute unsigned long length;
- Float32Array subset(in long start, in [Optional] long end);
+ Float32Array subarray(in long start, in [Optional] long end);
// void set(in Float32Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
diff --git a/Source/WebCore/html/canvas/Int16Array.cpp b/Source/WebCore/html/canvas/Int16Array.cpp
index fc1cbce..73a57d2 100644
--- a/Source/WebCore/html/canvas/Int16Array.cpp
+++ b/Source/WebCore/html/canvas/Int16Array.cpp
@@ -51,14 +51,14 @@ Int16Array::Int16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsi
{
}
-PassRefPtr<Int16Array> Int16Array::subset(int start) const
+PassRefPtr<Int16Array> Int16Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Int16Array> Int16Array::subset(int start, int end) const
+PassRefPtr<Int16Array> Int16Array::subarray(int start, int end) const
{
- return subsetImpl<Int16Array>(start, end);
+ return subarrayImpl<Int16Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Int16Array.h b/Source/WebCore/html/canvas/Int16Array.h
index 78f5bee..6c4f54b 100644
--- a/Source/WebCore/html/canvas/Int16Array.h
+++ b/Source/WebCore/html/canvas/Int16Array.h
@@ -41,8 +41,8 @@ public:
using TypedArrayBase<short>::set;
using IntegralTypedArrayBase<short>::set;
- PassRefPtr<Int16Array> subset(int start) const;
- PassRefPtr<Int16Array> subset(int start, int end) const;
+ PassRefPtr<Int16Array> subarray(int start) const;
+ PassRefPtr<Int16Array> subarray(int start, int end) const;
private:
Int16Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Int16Array.idl b/Source/WebCore/html/canvas/Int16Array.idl
index a673fe4..5dd395e 100644
--- a/Source/WebCore/html/canvas/Int16Array.idl
+++ b/Source/WebCore/html/canvas/Int16Array.idl
@@ -39,7 +39,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 2;
readonly attribute unsigned long length;
- Int16Array subset(in long start, in [Optional] long end);
+ Int16Array subarray(in long start, in [Optional] long end);
// void set(in Int16Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
diff --git a/Source/WebCore/html/canvas/Int32Array.cpp b/Source/WebCore/html/canvas/Int32Array.cpp
index 9e7f3a0..f6fde59 100644
--- a/Source/WebCore/html/canvas/Int32Array.cpp
+++ b/Source/WebCore/html/canvas/Int32Array.cpp
@@ -52,14 +52,14 @@ Int32Array::Int32Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsi
{
}
-PassRefPtr<Int32Array> Int32Array::subset(int start) const
+PassRefPtr<Int32Array> Int32Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Int32Array> Int32Array::subset(int start, int end) const
+PassRefPtr<Int32Array> Int32Array::subarray(int start, int end) const
{
- return subsetImpl<Int32Array>(start, end);
+ return subarrayImpl<Int32Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Int32Array.h b/Source/WebCore/html/canvas/Int32Array.h
index 8d15c41..c657300 100644
--- a/Source/WebCore/html/canvas/Int32Array.h
+++ b/Source/WebCore/html/canvas/Int32Array.h
@@ -41,8 +41,8 @@ public:
void set(TypedArrayBase<int>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<int>::set(array, offset, ec); }
void set(unsigned index, double value) { return IntegralTypedArrayBase<int>::set(index, value); }
- PassRefPtr<Int32Array> subset(int start) const;
- PassRefPtr<Int32Array> subset(int start, int end) const;
+ PassRefPtr<Int32Array> subarray(int start) const;
+ PassRefPtr<Int32Array> subarray(int start, int end) const;
private:
Int32Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Int32Array.idl b/Source/WebCore/html/canvas/Int32Array.idl
index 8f93493..c5a89ba 100644
--- a/Source/WebCore/html/canvas/Int32Array.idl
+++ b/Source/WebCore/html/canvas/Int32Array.idl
@@ -40,7 +40,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 4;
readonly attribute unsigned long length;
- Int32Array subset(in long start, in [Optional] long end);
+ Int32Array subarray(in long start, in [Optional] long end);
// void set(in Int32Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
diff --git a/Source/WebCore/html/canvas/Int8Array.cpp b/Source/WebCore/html/canvas/Int8Array.cpp
index 9207686..f30d694 100644
--- a/Source/WebCore/html/canvas/Int8Array.cpp
+++ b/Source/WebCore/html/canvas/Int8Array.cpp
@@ -52,14 +52,14 @@ Int8Array::Int8Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsign
{
}
-PassRefPtr<Int8Array> Int8Array::subset(int start) const
+PassRefPtr<Int8Array> Int8Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Int8Array> Int8Array::subset(int start, int end) const
+PassRefPtr<Int8Array> Int8Array::subarray(int start, int end) const
{
- return subsetImpl<Int8Array>(start, end);
+ return subarrayImpl<Int8Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Int8Array.h b/Source/WebCore/html/canvas/Int8Array.h
index 21c669a..aabdb97 100644
--- a/Source/WebCore/html/canvas/Int8Array.h
+++ b/Source/WebCore/html/canvas/Int8Array.h
@@ -43,8 +43,8 @@ public:
void set(TypedArrayBase<signed char>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<signed char>::set(array, offset, ec); }
void set(unsigned index, double value) { return IntegralTypedArrayBase<signed char>::set(index, value); }
- PassRefPtr<Int8Array> subset(int start) const;
- PassRefPtr<Int8Array> subset(int start, int end) const;
+ PassRefPtr<Int8Array> subarray(int start) const;
+ PassRefPtr<Int8Array> subarray(int start, int end) const;
private:
Int8Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Int8Array.idl b/Source/WebCore/html/canvas/Int8Array.idl
index 0229659..0a4d041 100644
--- a/Source/WebCore/html/canvas/Int8Array.idl
+++ b/Source/WebCore/html/canvas/Int8Array.idl
@@ -40,7 +40,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 1;
readonly attribute unsigned long length;
- Int8Array subset(in long start, in [Optional] long end);
+ Int8Array subarray(in long start, in [Optional] long end);
// void set(in Int8Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
diff --git a/Source/WebCore/html/canvas/TypedArrayBase.h b/Source/WebCore/html/canvas/TypedArrayBase.h
index 32a198e..e2a7c63 100644
--- a/Source/WebCore/html/canvas/TypedArrayBase.h
+++ b/Source/WebCore/html/canvas/TypedArrayBase.h
@@ -104,7 +104,7 @@ protected:
}
template <class Subclass>
- PassRefPtr<Subclass> subsetImpl(int start, int end) const
+ PassRefPtr<Subclass> subarrayImpl(int start, int end) const
{
unsigned offset, length;
calculateOffsetAndLength(start, end, m_length, &offset, &length);
diff --git a/Source/WebCore/html/canvas/Uint16Array.cpp b/Source/WebCore/html/canvas/Uint16Array.cpp
index 6f6389e..0f5c647 100644
--- a/Source/WebCore/html/canvas/Uint16Array.cpp
+++ b/Source/WebCore/html/canvas/Uint16Array.cpp
@@ -52,14 +52,14 @@ Uint16Array::Uint16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, un
{
}
-PassRefPtr<Uint16Array> Uint16Array::subset(int start) const
+PassRefPtr<Uint16Array> Uint16Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Uint16Array> Uint16Array::subset(int start, int end) const
+PassRefPtr<Uint16Array> Uint16Array::subarray(int start, int end) const
{
- return subsetImpl<Uint16Array>(start, end);
+ return subarrayImpl<Uint16Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Uint16Array.h b/Source/WebCore/html/canvas/Uint16Array.h
index 8aaf4b2..8ef04a4 100644
--- a/Source/WebCore/html/canvas/Uint16Array.h
+++ b/Source/WebCore/html/canvas/Uint16Array.h
@@ -43,8 +43,8 @@ public:
void set(TypedArrayBase<unsigned short>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<unsigned short>::set(array, offset, ec); }
void set(unsigned index, double value) { return IntegralTypedArrayBase<unsigned short>::set(index, value); }
- PassRefPtr<Uint16Array> subset(int start) const;
- PassRefPtr<Uint16Array> subset(int start, int end) const;
+ PassRefPtr<Uint16Array> subarray(int start) const;
+ PassRefPtr<Uint16Array> subarray(int start, int end) const;
private:
Uint16Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Uint16Array.idl b/Source/WebCore/html/canvas/Uint16Array.idl
index e32f7a0..52f45ea 100644
--- a/Source/WebCore/html/canvas/Uint16Array.idl
+++ b/Source/WebCore/html/canvas/Uint16Array.idl
@@ -40,7 +40,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 2;
readonly attribute unsigned long length;
- Uint16Array subset(in long start, in [Optional] long end);
+ Uint16Array subarray(in long start, in [Optional] long end);
// void set(in Uint16Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
diff --git a/Source/WebCore/html/canvas/Uint32Array.cpp b/Source/WebCore/html/canvas/Uint32Array.cpp
index 56db152..2eb0e4a 100644
--- a/Source/WebCore/html/canvas/Uint32Array.cpp
+++ b/Source/WebCore/html/canvas/Uint32Array.cpp
@@ -52,14 +52,14 @@ Uint32Array::Uint32Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, un
{
}
-PassRefPtr<Uint32Array> Uint32Array::subset(int start) const
+PassRefPtr<Uint32Array> Uint32Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Uint32Array> Uint32Array::subset(int start, int end) const
+PassRefPtr<Uint32Array> Uint32Array::subarray(int start, int end) const
{
- return subsetImpl<Uint32Array>(start, end);
+ return subarrayImpl<Uint32Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Uint32Array.h b/Source/WebCore/html/canvas/Uint32Array.h
index 011d9f2..196a67f 100644
--- a/Source/WebCore/html/canvas/Uint32Array.h
+++ b/Source/WebCore/html/canvas/Uint32Array.h
@@ -43,8 +43,8 @@ public:
void set(TypedArrayBase<unsigned int>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<unsigned int>::set(array, offset, ec); }
void set(unsigned index, double value) { return IntegralTypedArrayBase<unsigned int>::set(index, value); }
- PassRefPtr<Uint32Array> subset(int start) const;
- PassRefPtr<Uint32Array> subset(int start, int end) const;
+ PassRefPtr<Uint32Array> subarray(int start) const;
+ PassRefPtr<Uint32Array> subarray(int start, int end) const;
private:
Uint32Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Uint32Array.idl b/Source/WebCore/html/canvas/Uint32Array.idl
index 287062e..17487a9 100644
--- a/Source/WebCore/html/canvas/Uint32Array.idl
+++ b/Source/WebCore/html/canvas/Uint32Array.idl
@@ -40,7 +40,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 4;
readonly attribute unsigned long length;
- Uint32Array subset(in long start, in [Optional] long end);
+ Uint32Array subarray(in long start, in [Optional] long end);
// void set(in Uint32Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
diff --git a/Source/WebCore/html/canvas/Uint8Array.cpp b/Source/WebCore/html/canvas/Uint8Array.cpp
index d7cc7a0..423feba 100644
--- a/Source/WebCore/html/canvas/Uint8Array.cpp
+++ b/Source/WebCore/html/canvas/Uint8Array.cpp
@@ -52,14 +52,14 @@ Uint8Array::Uint8Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsi
{
}
-PassRefPtr<Uint8Array> Uint8Array::subset(int start) const
+PassRefPtr<Uint8Array> Uint8Array::subarray(int start) const
{
- return subset(start, length());
+ return subarray(start, length());
}
-PassRefPtr<Uint8Array> Uint8Array::subset(int start, int end) const
+PassRefPtr<Uint8Array> Uint8Array::subarray(int start, int end) const
{
- return subsetImpl<Uint8Array>(start, end);
+ return subarrayImpl<Uint8Array>(start, end);
}
}
diff --git a/Source/WebCore/html/canvas/Uint8Array.h b/Source/WebCore/html/canvas/Uint8Array.h
index 6f0b515..a3a42dc 100644
--- a/Source/WebCore/html/canvas/Uint8Array.h
+++ b/Source/WebCore/html/canvas/Uint8Array.h
@@ -43,8 +43,8 @@ public:
void set(TypedArrayBase<unsigned char>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<unsigned char>::set(array, offset, ec); }
void set(unsigned index, double value) { return IntegralTypedArrayBase<unsigned char>::set(index, value); }
- PassRefPtr<Uint8Array> subset(int start) const;
- PassRefPtr<Uint8Array> subset(int start, int end) const;
+ PassRefPtr<Uint8Array> subarray(int start) const;
+ PassRefPtr<Uint8Array> subarray(int start, int end) const;
private:
Uint8Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/Source/WebCore/html/canvas/Uint8Array.idl b/Source/WebCore/html/canvas/Uint8Array.idl
index 2789b35..b533bb3 100644
--- a/Source/WebCore/html/canvas/Uint8Array.idl
+++ b/Source/WebCore/html/canvas/Uint8Array.idl
@@ -40,7 +40,7 @@ module html {
const unsigned int BYTES_PER_ELEMENT = 1;
readonly attribute unsigned long length;
- Uint8Array subset(in long start, in [Optional] long end);
+ Uint8Array subarray(in long start, in [Optional] long end);
// void set(in Uint8Array array, [Optional] in unsigned long offset);
// void set(in sequence<long> array, [Optional] in unsigned long offset);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list