Source/WebCore/bindings/js/JSArrayBufferViewHelper.h - Issue 7523024: Merge 91803 - Float32Array(ArrayBuffer, index, length) constructor working incorrectly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/bindings/js/JSArrayBufferViewHelper.h

Issue 7523024: Merge 91803 - Float32Array(ArrayBuffer, index, length) constructor working incorrectly. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 5 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 | « LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt ('k') | Source/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/bindings/js/JSArrayBufferViewHelper.h

===================================================================

--- Source/WebCore/bindings/js/JSArrayBufferViewHelper.h (revision 91888)

+++ Source/WebCore/bindings/js/JSArrayBufferViewHelper.h (working copy)

@@ -93,11 +93,16 @@

return 0;

unsigned offset = (exec->argumentCount() > 1) ? exec->argument(1).toUInt32(exec) : 0;

- if ((buffer->byteLength() - offset) % sizeof(T))

- throwError(exec, createRangeError(exec, "ArrayBuffer length minus the byteOffset is not a multiple of the element size."));

- unsigned int length = (buffer->byteLength() - offset) / sizeof(T);

+ unsigned int length = 0;

if (exec->argumentCount() > 2)

length = exec->argument(2).toUInt32(exec);

+ else {

+ if ((buffer->byteLength() - offset) % sizeof(T)) {

+ throwError(exec, createRangeError(exec, "ArrayBuffer length minus the byteOffset is not a multiple of the element size."));

+ return 0;

+ }

+ length = (buffer->byteLength() - offset) / sizeof(T);

+ }

RefPtr<C> array = C::create(buffer, offset, length);

if (!array)

setDOMException(exec, INDEX_SIZE_ERR);