wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 786903 - restore typedArray(otherTypedArray) initialization fastpath; r=sfink

Browse Source
This commit is contained in:
Nathan Froyd 2012-08-30 11:39:42 -04:00
parent ecc761ed3a
commit 32b99ebba8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jstypedarray.cpp
View File

@ -1726,8 +1726,11 @@ class TypedArrayTemplate
fromArray(JSContext *cx, HandleObject other)
{
uint32_t len;
if (!GetLengthProperty(cx, other, &len))
if (other->isTypedArray()) {
len = length(other);
} else if (!GetLengthProperty(cx, other, &len)) {
return NULL;
}
RootedObject bufobj(cx, createBufferWithSizeAndCount(cx, len));
if (!bufobj)
@ -1821,6 +1824,9 @@ class TypedArrayTemplate
JS_ASSERT(thisTypedArrayObj->isTypedArray());
JS_ASSERT(offset <= length(thisTypedArrayObj));
JS_ASSERT(len <= length(thisTypedArrayObj) - offset);
if (ar->isTypedArray())
return copyFromTypedArray(cx, thisTypedArrayObj, ar, offset);
NativeType *dest = static_cast<NativeType*>(viewData(thisTypedArrayObj)) + offset;
SkipRoot skip(cx, &dest);