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

Unified Diff: Source/bindings/core/v8/V8Binding.h

Issue 1125683002: Avoid nearly identical toImplArray() and toImplHeapArray() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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 | « Source/bindings/core/v8/DictionaryHelperForCore.cpp ('k') | Source/bindings/core/v8/V8BindingTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/core/v8/V8Binding.h
diff --git a/Source/bindings/core/v8/V8Binding.h b/Source/bindings/core/v8/V8Binding.h
index f1b869fdf2b95832b9f2d3f2ba20fb12ab63b005..6a484ee2359c021922eb26d4a96f67834c4de107 100644
--- a/Source/bindings/core/v8/V8Binding.h
+++ b/Source/bindings/core/v8/V8Binding.h
@@ -752,85 +752,54 @@ HeapVector<Member<T>> toMemberNativeArray(v8::Local<v8::Value> value, int argume
// Converts a JavaScript value to an array as per the Web IDL specification:
// http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-array
-template <typename T>
-Vector<T> toImplArray(v8::Local<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
+template <typename VectorType>
+VectorType toImplArray(v8::Local<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
{
- uint32_t length = 0;
- if (value->IsArray()) {
- length = v8::Local<v8::Array>::Cast(value)->Length();
- } else if (!toV8Sequence(value, length, isolate, exceptionState)) {
- if (!exceptionState.hadException())
- exceptionState.throwTypeError(ExceptionMessages::notAnArrayTypeArgumentOrValue(argumentIndex));
- return Vector<T>();
- }
-
- if (length > WTF::DefaultAllocatorQuantizer::kMaxUnquantizedAllocation / sizeof(T)) {
- exceptionState.throwTypeError("Array length exceeds supported limit.");
- return Vector<T>();
- }
-
- Vector<T> result;
- result.reserveInitialCapacity(length);
- typedef NativeValueTraits<T> TraitsType;
- v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
- v8::TryCatch block;
- for (uint32_t i = 0; i < length; ++i) {
- v8::Local<v8::Value> element;
- if (!v8Call(object->Get(isolate->GetCurrentContext(), i), element, block)) {
- exceptionState.rethrowV8Exception(block.Exception());
- return Vector<T>();
- }
- result.uncheckedAppend(TraitsType::nativeValue(isolate, element, exceptionState));
- if (exceptionState.hadException())
- return Vector<T>();
- }
- return result;
-}
+ typedef typename VectorType::ValueType ValueType;
+ typedef NativeValueTraits<ValueType> TraitsType;
-template <typename T>
-HeapVector<T> toImplHeapArray(v8::Local<v8::Value> value, int argumentIndex, v8::Isolate* isolate, ExceptionState& exceptionState)
-{
uint32_t length = 0;
if (value->IsArray()) {
length = v8::Local<v8::Array>::Cast(value)->Length();
} else if (!toV8Sequence(value, length, isolate, exceptionState)) {
if (!exceptionState.hadException())
exceptionState.throwTypeError(ExceptionMessages::notAnArrayTypeArgumentOrValue(argumentIndex));
- return HeapVector<T>();
+ return VectorType();
}
- if (length > WTF::DefaultAllocatorQuantizer::kMaxUnquantizedAllocation / sizeof(T)) {
+ if (length > WTF::DefaultAllocatorQuantizer::kMaxUnquantizedAllocation / sizeof(ValueType)) {
exceptionState.throwTypeError("Array length exceeds supported limit.");
- return HeapVector<T>();
+ return VectorType();
}
- HeapVector<T> result;
+ VectorType result;
result.reserveInitialCapacity(length);
- typedef NativeValueTraits<T> TraitsType;
v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
v8::TryCatch block;
for (uint32_t i = 0; i < length; ++i) {
v8::Local<v8::Value> element;
if (!v8Call(object->Get(isolate->GetCurrentContext(), i), element, block)) {
exceptionState.rethrowV8Exception(block.Exception());
- return HeapVector<T>();
+ return VectorType();
}
result.uncheckedAppend(TraitsType::nativeValue(isolate, element, exceptionState));
if (exceptionState.hadException())
- return HeapVector<T>();
+ return VectorType();
}
return result;
}
-template <typename T>
-Vector<T> toImplArray(const Vector<ScriptValue>& value, v8::Isolate* isolate, ExceptionState& exceptionState)
+template <typename VectorType>
+VectorType toImplArray(const Vector<ScriptValue>& value, v8::Isolate* isolate, ExceptionState& exceptionState)
{
- Vector<T> result;
+ VectorType result;
+ typedef typename VectorType::ValueType ValueType;
+ typedef NativeValueTraits<ValueType> TraitsType;
result.reserveInitialCapacity(value.size());
for (unsigned i = 0; i < value.size(); ++i) {
- result.uncheckedAppend(NativeValueTraits<T>::nativeValue(isolate, value[i].v8Value(), exceptionState));
+ result.uncheckedAppend(TraitsType::nativeValue(isolate, value[i].v8Value(), exceptionState));
if (exceptionState.hadException())
- return Vector<T>();
+ return VectorType();
}
return result;
}
@@ -958,7 +927,7 @@ template <typename T>
struct NativeValueTraits<Vector<T>> {
static inline Vector<T> nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
{
- return toImplArray<T>(value, 0, isolate, exceptionState);
+ return toImplArray<Vector<T>>(value, 0, isolate, exceptionState);
}
};
« no previous file with comments | « Source/bindings/core/v8/DictionaryHelperForCore.cpp ('k') | Source/bindings/core/v8/V8BindingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698