| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "bindings/modules/v8/WebGLAny.h" | 5 #include "bindings/modules/v8/WebGLAny.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ToV8.h" | 7 #include "bindings/core/v8/ToV8.h" |
| 8 #include "wtf/text/WTFString.h" | 8 #include "wtf/text/WTFString.h" |
| 9 | 9 |
| 10 namespace blink { | 10 namespace blink { |
| 11 | 11 |
| 12 ScriptValue WebGLAny(ScriptState* scriptState, bool value) | 12 ScriptValue WebGLAny(ScriptState* scriptState, bool value) |
| 13 { | 13 { |
| 14 return ScriptValue(scriptState, v8Boolean(value, scriptState->isolate())); | 14 return ScriptValue(scriptState, v8Boolean(value, scriptState->isolate())); |
| 15 } | 15 } |
| 16 | 16 |
| 17 ScriptValue WebGLAny(ScriptState* scriptState, const bool* value, size_t size) | 17 ScriptValue WebGLAny(ScriptState* scriptState, const bool* value, size_t size) |
| 18 { | 18 { |
| 19 v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), size); | 19 v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), size); |
| 20 for (size_t i = 0; i < size; ++i) { | 20 for (size_t i = 0; i < size; ++i) { |
| 21 if (!v8CallBoolean(array->Set(scriptState->context(), v8::Integer::New(s
criptState->isolate(), i), v8Boolean(value[i], scriptState->isolate())))) | 21 if (!v8CallBoolean(array->CreateDataProperty(scriptState->context(), i,
v8Boolean(value[i], scriptState->isolate())))) |
| 22 return ScriptValue(); | 22 return ScriptValue(); |
| 23 } | 23 } |
| 24 return ScriptValue(scriptState, array); | 24 return ScriptValue(scriptState, array); |
| 25 } | 25 } |
| 26 | 26 |
| 27 ScriptValue WebGLAny(ScriptState* scriptState, const Vector<bool>& value) | 27 ScriptValue WebGLAny(ScriptState* scriptState, const Vector<bool>& value) |
| 28 { | 28 { |
| 29 size_t size = value.size(); | 29 size_t size = value.size(); |
| 30 v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), size); | 30 v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), size); |
| 31 for (size_t i = 0; i < size; ++i) { | 31 for (size_t i = 0; i < size; ++i) { |
| 32 if (!v8CallBoolean(array->Set(scriptState->context(), v8::Integer::New(s
criptState->isolate(), i), v8Boolean(value[i], scriptState->isolate())))) | 32 if (!v8CallBoolean(array->CreateDataProperty(scriptState->context(), i,
v8Boolean(value[i], scriptState->isolate())))) |
| 33 return ScriptValue(); | 33 return ScriptValue(); |
| 34 } | 34 } |
| 35 return ScriptValue(scriptState, array); | 35 return ScriptValue(scriptState, array); |
| 36 } | 36 } |
| 37 | 37 |
| 38 ScriptValue WebGLAny(ScriptState* scriptState, const Vector<unsigned>& value) | 38 ScriptValue WebGLAny(ScriptState* scriptState, const Vector<unsigned>& value) |
| 39 { | 39 { |
| 40 size_t size = value.size(); | 40 size_t size = value.size(); |
| 41 v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), size); | 41 v8::Local<v8::Array> array = v8::Array::New(scriptState->isolate(), size); |
| 42 for (size_t i = 0; i < size; ++i) { | 42 for (size_t i = 0; i < size; ++i) { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 { | 106 { |
| 107 return ScriptValue(scriptState, toV8(value, scriptState->context()->Global()
, scriptState->isolate())); | 107 return ScriptValue(scriptState, toV8(value, scriptState->context()->Global()
, scriptState->isolate())); |
| 108 } | 108 } |
| 109 | 109 |
| 110 ScriptValue WebGLAny(ScriptState* scriptState, DOMUint32Array* value) | 110 ScriptValue WebGLAny(ScriptState* scriptState, DOMUint32Array* value) |
| 111 { | 111 { |
| 112 return ScriptValue(scriptState, toV8(value, scriptState->context()->Global()
, scriptState->isolate())); | 112 return ScriptValue(scriptState, toV8(value, scriptState->context()->Global()
, scriptState->isolate())); |
| 113 } | 113 } |
| 114 | 114 |
| 115 } // namespace blink | 115 } // namespace blink |
| OLD | NEW |