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

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

 /*
  * Copyright (C) 2007-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "config.h"
 #include "bindings/core/v8/V8InjectedScriptHost.h"
 
 #include "bindings/core/v8/BindingSecurity.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptDebugServer.h"
 #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"
 #include "bindings/core/v8/V8Node.h"
 #include "bindings/core/v8/V8NodeList.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/V8Storage.h"
 #include "bindings/core/v8/custom/V8Float32ArrayCustom.h"
 #include "bindings/core/v8/custom/V8Float64ArrayCustom.h"
 #include "bindings/core/v8/custom/V8Int16ArrayCustom.h"
@@ skipping 107 matching lines @@
 {
     if (info.Length() < 1)
         return;
     v8::Isolate* isolate = info.GetIsolate();
 
     v8::Handle<v8::Value> value = info[0];
     if (value->IsString()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "string"));
         return;
     }
-    if (value->IsArray()) {
+    if (value->IsArray() || value->IsTypedArray()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "array"));
         return;
     }
     if (value->IsBoolean()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "boolean"));
         return;
     }
     if (value->IsNumber()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "number"));
         return;
     }
+    if (value->IsSymbol()) {
+        v8SetReturnValue(info, v8AtomicString(isolate, "symbol"));
+        return;
+    }
     if (value->IsDate()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "date"));
         return;
     }
     if (value->IsRegExp()) {
         v8SetReturnValue(info, v8AtomicString(isolate, "regexp"));
         return;
     }
     if (V8Node::hasInstance(value, isolate)) {
         v8SetReturnValue(info, v8AtomicString(isolate, "node"));
         return;
     }
-    if (V8NodeList::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 (V8HTMLCollection::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;
     }
-    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)) {
-        v8SetReturnValue(info, v8AtomicString(isolate, "array"));
-        return;
-    }
-    if (V8Uint8ClampedArray::hasInstance(value, isolate)) {
-        v8SetReturnValue(info, v8AtomicString(isolate, "array"));
-        return;
-    }
 }
 
 void V8InjectedScriptHost::functionDetailsMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     if (info.Length() < 1)
         return;
 
     v8::Isolate* isolate = info.GetIsolate();
 
     v8::Handle<v8::Value> value = info[0];
@@ skipping 284 matching lines @@
     InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
     ScriptDebugServer& debugServer = host->scriptDebugServer();
     debugServer.muteWarningsAndDeprecations();
 
     callFunctionMethodCustom(info);
 
     debugServer.unmuteWarningsAndDeprecations();
 }
 
 } // namespace blink