DevTools: Simplify isArrayLike() in injected script and extend InjectedScriptHost.type()

Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp

Index: Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
diff --git a/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp b/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
index dd02a7ee38c6fb034411b5effb7ef81fdb1e38fe..f8e5c93c7efeeef0f44e8f89353d31e2dae3e487 100644
--- a/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
+++ b/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
@@ -37,6 +37,7 @@
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8AbstractEventListener.h"
 #include "bindings/core/v8/V8Binding.h"
+#include "bindings/core/v8/V8DOMTokenList.h"
 #include "bindings/core/v8/V8EventTarget.h"
 #include "bindings/core/v8/V8HTMLAllCollection.h"
 #include "bindings/core/v8/V8HTMLCollection.h"
@@ -164,7 +165,7 @@ void V8InjectedScriptHost::typeMethodCustom(const v8::FunctionCallbackInfo<v8::V
         v8SetReturnValue(info, v8AtomicString(isolate, "string"));
         return;
     }
-    if (value->IsArray()) {
+    if (value->IsArray() || value->IsTypedArray()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "array"));
         return;
     }
@@ -176,6 +177,10 @@ void V8InjectedScriptHost::typeMethodCustom(const v8::FunctionCallbackInfo<v8::V
         v8SetReturnValue(info, v8AtomicString(isolate, "number"));
         return;
     }
+    if (value->IsSymbol()) {
+        v8SetReturnValue(info, v8AtomicString(isolate, "symbol"));
+        return;
+    }
     if (value->IsDate()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "date"));
         return;
@@ -188,27 +193,22 @@ void V8InjectedScriptHost::typeMethodCustom(const v8::FunctionCallbackInfo<v8::V
         v8SetReturnValue(info, v8AtomicString(isolate, "node"));
         return;
     }
-    if (V8NodeList::hasInstance(value, isolate)) {
-        v8SetReturnValue(info, v8AtomicString(isolate, "array"));
-        return;
-    }
-    if (V8HTMLCollection::hasInstance(value, isolate)) {
-        v8SetReturnValue(info, v8AtomicString(isolate, "array"));
-        return;
-    }
-    if (V8Int8Array::hasInstance(value, isolate) || V8Int16Array::hasInstance(value, isolate) || V8Int32Array::hasInstance(value, isolate)) {
-        v8SetReturnValue(info, v8AtomicString(isolate, "array"));
-        return;
-    }
-    if (V8Uint8Array::hasInstance(value, isolate) || V8Uint16Array::hasInstance(value, isolate) || V8Uint32Array::hasInstance(value, isolate)) {
-        v8SetReturnValue(info, v8AtomicString(isolate, "array"));
-        return;
-    }
-    if (V8Float32Array::hasInstance(value, isolate) || V8Float64Array::hasInstance(value, isolate)) {
+    if (V8NodeList::hasInstance(value, isolate)
+        || V8DOMTokenList::hasInstance(value, isolate)
+        || V8HTMLCollection::hasInstance(value, isolate)
+        || V8HTMLAllCollection::hasInstance(value, isolate)) {
         v8SetReturnValue(info, v8AtomicString(isolate, "array"));
         return;
     }
-    if (V8Uint8ClampedArray::hasInstance(value, isolate)) {
+    if (V8Int8Array::hasInstance(value, isolate)
+        || V8Int16Array::hasInstance(value, isolate)
+        || V8Int32Array::hasInstance(value, isolate)
+        || V8Uint8Array::hasInstance(value, isolate)
+        || V8Uint8ClampedArray::hasInstance(value, isolate)

[yurys, 2014/08/12 08:52:48]

Why value->IsTypedArray check above is not enough?

[aandrey, 2014/08/12 09:49:48]

You're right. Removed.

+        || V8Uint16Array::hasInstance(value, isolate)
+        || V8Uint32Array::hasInstance(value, isolate)
+        || V8Float32Array::hasInstance(value, isolate)
+        || V8Float64Array::hasInstance(value, isolate)) {
         v8SetReturnValue(info, v8AtomicString(isolate, "array"));
         return;
     }