Index: src/js/typedarray.js |
diff --git a/src/js/typedarray.js b/src/js/typedarray.js |
index 204e0918b24a45550be3440ac389cd2178751838..928db5cbd7838bfe5b8e46586f35ff60dada84ba 100644 |
--- a/src/js/typedarray.js |
+++ b/src/js/typedarray.js |
@@ -28,7 +28,6 @@ var InnerArrayFilter; |
var InnerArrayFind; |
var InnerArrayFindIndex; |
var InnerArrayForEach; |
-var InnerArrayIndexOf; |
var InnerArrayJoin; |
var InnerArrayLastIndexOf; |
var InnerArrayReduce; |
@@ -79,7 +78,6 @@ utils.Import(function(from) { |
InnerArrayFind = from.InnerArrayFind; |
InnerArrayFindIndex = from.InnerArrayFindIndex; |
InnerArrayForEach = from.InnerArrayForEach; |
- InnerArrayIndexOf = from.InnerArrayIndexOf; |
InnerArrayJoin = from.InnerArrayJoin; |
InnerArrayLastIndexOf = from.InnerArrayLastIndexOf; |
InnerArrayReduce = from.InnerArrayReduce; |
@@ -572,7 +570,28 @@ function TypedArrayIndexOf(element, index) { |
if (!IS_TYPEDARRAY(this)) throw %make_type_error(kNotTypedArray); |
var length = %_TypedArrayGetLength(this); |
- return InnerArrayIndexOf(this, element, index, length); |
+ |
Benedikt Meurer
2016/08/11 04:02:24
You could do this change to typedarray.js as a sep
mattloring
2016/08/11 17:32:57
Opened here: https://codereview.chromium.org/22435
|
+ if (length === 0) return -1; |
+ var n = TO_INTEGER(index); |
+ |
+ var k; |
+ if (n >= 0) { |
+ k = n; |
+ } else { |
+ k = length + n; |
+ if (k < 0) { |
+ k = 0; |
+ } |
+ } |
+ |
+ while (k < length) { |
+ var elementK = this[k]; |
+ if (k in this && element === elementK) { |
+ return k; |
+ } |
+ ++k; |
+ } |
+ return -1; |
} |
%FunctionSetLength(TypedArrayIndexOf, 1); |