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

Side by Side Diff: src/typedarray.js

Issue 80753004: Fix previous backmerge (3.21.18.10 / r17958) (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.21
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 newByteLength = newLength * elementSize; 62 newByteLength = newLength * elementSize;
63 } 63 }
64 if (offset + newByteLength > bufferByteLength) { 64 if (offset + newByteLength > bufferByteLength) {
65 throw MakeRangeError("invalid_typed_array_length"); 65 throw MakeRangeError("invalid_typed_array_length");
66 } 66 }
67 %TypedArrayInitialize(obj, arrayId, buffer, offset, newByteLength); 67 %TypedArrayInitialize(obj, arrayId, buffer, offset, newByteLength);
68 } 68 }
69 69
70 function ConstructByLength(obj, length) { 70 function ConstructByLength(obj, length) {
71 var l = ToPositiveInteger(length, "invalid_typed_array_length"); 71 var l = ToPositiveInteger(length, "invalid_typed_array_length");
72 if (l > %MaxSmi()) {
73 throw MakeRangeError("invalid_typed_array_length");
74 }
72 var byteLength = l * elementSize; 75 var byteLength = l * elementSize;
73 var buffer = new global.ArrayBuffer(byteLength); 76 var buffer = new global.ArrayBuffer(byteLength);
74 %TypedArrayInitialize(obj, arrayId, buffer, 0, byteLength); 77 %TypedArrayInitialize(obj, arrayId, buffer, 0, byteLength);
75 } 78 }
76 79
77 function ConstructByArrayLike(obj, arrayLike) { 80 function ConstructByArrayLike(obj, arrayLike) {
78 var length = arrayLike.length; 81 var length = arrayLike.length;
79 var l = ToPositiveInteger(length, "invalid_typed_array_length"); 82 var l = ToPositiveInteger(length, "invalid_typed_array_length");
80 if (l > %MaxSmi()) {
81 throw MakeRangeError("invalid_typed_array_length");
82 }
83 if(!%TypedArrayInitializeFromArrayLike(obj, arrayId, arrayLike, l)) { 83 if(!%TypedArrayInitializeFromArrayLike(obj, arrayId, arrayLike, l)) {
84 for (var i = 0; i < l; i++) { 84 for (var i = 0; i < l; i++) {
85 obj[i] = arrayLike[i]; 85 obj[i] = arrayLike[i];
86 } 86 }
87 } 87 }
88 } 88 }
89 89
90 return function (arg1, arg2, arg3) { 90 return function (arg1, arg2, arg3) {
91 if (%_IsConstructCall()) { 91 if (%_IsConstructCall()) {
92 if (IS_ARRAYBUFFER(arg1)) { 92 if (IS_ARRAYBUFFER(arg1)) {
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 589
590 "getFloat32", DataViewGetFloat32, 590 "getFloat32", DataViewGetFloat32,
591 "setFloat32", DataViewSetFloat32, 591 "setFloat32", DataViewSetFloat32,
592 592
593 "getFloat64", DataViewGetFloat64, 593 "getFloat64", DataViewGetFloat64,
594 "setFloat64", DataViewSetFloat64 594 "setFloat64", DataViewSetFloat64
595 )); 595 ));
596 } 596 }
597 597
598 SetupDataView(); 598 SetupDataView();
OLDNEW
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698