Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Unified Diff: src/typedarray.js

Issue 1192433003: Revert of Add %TypedArray% to proto chain (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/runtime/runtime-object.cc ('k') | test/mjsunit/es6/built-in-accessor-names.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/typedarray.js
diff --git a/src/typedarray.js b/src/typedarray.js
index 056a0d79254d721c77042c1c5b03d0b1daf16301..ce52cdf15c0b50db12eb9c904fd1781ce30acf26 100644
--- a/src/typedarray.js
+++ b/src/typedarray.js
@@ -46,44 +46,6 @@
var InternalArray = utils.InternalArray;
// --------------- Typed Arrays ---------------------
-
-function TypedArray() {
- if (!%_IsConstructCall()) {
- throw MakeTypeError(kConstructorNotFunction, "TypedArray")
- }
- // TODO(littledan): When the TypedArrays code is refactored to provide
- // a common constructor entrypoint for v8:4182, call that here.
-}
-
-function TypedArray_GetBuffer() {
- if (!%_IsTypedArray(this)) {
- throw MakeTypeError(kIncompatibleMethodReceiver, "TypedArray.buffer", this);
- }
- return %TypedArrayGetBuffer(this);
-}
-
-function TypedArray_GetByteLength() {
- if (!%_IsTypedArray(this)) {
- throw MakeTypeError(kIncompatibleMethodReceiver, "TypedArray.byteLength",
- this);
- }
- return %_ArrayBufferViewGetByteLength(this);
-}
-
-function TypedArray_GetByteOffset() {
- if (!%_IsTypedArray(this)) {
- throw MakeTypeError(kIncompatibleMethodReceiver, "TypedArray.byteOffset",
- this);
- }
- return %_ArrayBufferViewGetByteOffset(this);
-}
-
-function TypedArray_GetLength() {
- if (!%_IsTypedArray(this)) {
- throw MakeTypeError(kIncompatibleMethodReceiver, "TypedArray.length", this);
- }
- return %_TypedArrayGetLength(this);
-}
macro TYPED_ARRAY_CONSTRUCTOR(ARRAY_ID, NAME, ELEMENT_SIZE)
function NAMEConstructByArrayBuffer(obj, buffer, byteOffset, length) {
@@ -208,6 +170,34 @@
} else {
throw MakeTypeError(kConstructorNotFunction, "NAME")
}
+}
+
+function NAME_GetBuffer() {
+ if (!(%_ClassOf(this) === 'NAME')) {
+ throw MakeTypeError(kIncompatibleMethodReceiver, "NAME.buffer", this);
+ }
+ return %TypedArrayGetBuffer(this);
+}
+
+function NAME_GetByteLength() {
+ if (!(%_ClassOf(this) === 'NAME')) {
+ throw MakeTypeError(kIncompatibleMethodReceiver, "NAME.byteLength", this);
+ }
+ return %_ArrayBufferViewGetByteLength(this);
+}
+
+function NAME_GetByteOffset() {
+ if (!(%_ClassOf(this) === 'NAME')) {
+ throw MakeTypeError(kIncompatibleMethodReceiver, "NAME.byteOffset", this);
+ }
+ return %_ArrayBufferViewGetByteOffset(this);
+}
+
+function NAME_GetLength() {
+ if (!(%_ClassOf(this) === 'NAME')) {
+ throw MakeTypeError(kIncompatibleMethodReceiver, "NAME.length", this);
+ }
+ return %_TypedArrayGetLength(this);
}
function NAMESubArray(begin, end) {
@@ -357,33 +347,29 @@
// -------------------------------------------------------------------
-utils.InstallGetter(TypedArray.prototype, "buffer", TypedArray_GetBuffer);
-utils.InstallGetter(TypedArray.prototype, "byteOffset",
- TypedArray_GetByteOffset, DONT_ENUM);
-utils.InstallGetter(TypedArray.prototype, "byteLength",
- TypedArray_GetByteLength, DONT_ENUM);
-utils.InstallGetter(TypedArray.prototype, "length", TypedArray_GetLength,
- DONT_ENUM);
-utils.InstallGetter(TypedArray.prototype, symbolToStringTag,
- TypedArrayGetToStringTag, DONT_ENUM);
-utils.InstallFunctions(TypedArray.prototype, DONT_ENUM, [
- "set", TypedArraySet
-]);
-
macro SETUP_TYPED_ARRAY(ARRAY_ID, NAME, ELEMENT_SIZE)
%SetCode(GlobalNAME, NAMEConstructor);
- %InternalSetPrototype(GlobalNAME, TypedArray);
- %FunctionSetPrototype(GlobalNAME, new TypedArray());
- %AddNamedProperty(GlobalNAME.prototype,
- "BYTES_PER_ELEMENT", ELEMENT_SIZE,
- READ_ONLY | DONT_ENUM | DONT_DELETE);
+ %FunctionSetPrototype(GlobalNAME, new GlobalObject());
%AddNamedProperty(GlobalNAME, "BYTES_PER_ELEMENT", ELEMENT_SIZE,
READ_ONLY | DONT_ENUM | DONT_DELETE);
%AddNamedProperty(GlobalNAME.prototype,
"constructor", global.NAME, DONT_ENUM);
+ %AddNamedProperty(GlobalNAME.prototype,
+ "BYTES_PER_ELEMENT", ELEMENT_SIZE,
+ READ_ONLY | DONT_ENUM | DONT_DELETE);
+ utils.InstallGetter(GlobalNAME.prototype, "buffer", NAME_GetBuffer);
+ utils.InstallGetter(GlobalNAME.prototype, "byteOffset", NAME_GetByteOffset,
+ DONT_ENUM | DONT_DELETE);
+ utils.InstallGetter(GlobalNAME.prototype, "byteLength", NAME_GetByteLength,
+ DONT_ENUM | DONT_DELETE);
+ utils.InstallGetter(GlobalNAME.prototype, "length", NAME_GetLength,
+ DONT_ENUM | DONT_DELETE);
+ utils.InstallGetter(GlobalNAME.prototype, symbolToStringTag,
+ TypedArrayGetToStringTag);
utils.InstallFunctions(GlobalNAME.prototype, DONT_ENUM, [
- "subarray", NAMESubArray
+ "subarray", NAMESubArray,
+ "set", TypedArraySet
]);
endmacro
« no previous file with comments | « src/runtime/runtime-object.cc ('k') | test/mjsunit/es6/built-in-accessor-names.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698