Improve TypeError messages from failed array conversions.

Source/bindings/v8/V8Utilities.cpp

 /*
  * Copyright (C) 2008, 2009 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "bindings/v8/V8Utilities.h"
 
 #include "V8MessagePort.h"
+#include "bindings/v8/ExceptionMessages.h"
 #include "bindings/v8/ScriptState.h"
 #include "bindings/v8/V8AbstractEventListener.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/custom/V8ArrayBufferCustom.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/MessagePort.h"
 #include "core/frame/Frame.h"
 #include "core/workers/WorkerGlobalScope.h"
@@ skipping 24 matching lines @@
         ports.resize(0);
         arrayBuffers.resize(0);
         return true;
     }
 
     uint32_t length = 0;
     if (value->IsArray()) {
         v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(value);
         length = array->Length();
     } else {
-        if (toV8Sequence(value, length, &notASequence, isolate).IsEmpty())
+        if (toV8Sequence(value, length, notASequence, isolate).IsEmpty())
             return false;
     }
 
     v8::Local<v8::Object> transferrables = v8::Local<v8::Object>::Cast(value);
 
     // Validate the passed array of transferrables.
     for (unsigned int i = 0; i < length; ++i) {
         v8::Local<v8::Value> transferrable = transferrables->Get(i);
         // Validation of non-null objects, per HTML5 spec 10.3.3.
         if (isUndefinedOrNull(transferrable)) {
@@ skipping 12 matching lines @@
         } else if (V8ArrayBuffer::HasInstance(transferrable, isolate, worldType(isolate)))
             arrayBuffers.append(V8ArrayBuffer::toNative(v8::Handle<v8::Object>::Cast(transferrable)));
         else {
             setDOMException(DataCloneError, isolate);
             return false;
         }
     }
     return true;
 }
 
-bool getMessagePortArray(v8::Local<v8::Value> value, MessagePortArray& ports, v8::Isolate* isolate)
+bool getMessagePortArray(v8::Local<v8::Value> value, const String& propertyName, MessagePortArray& ports, v8::Isolate* isolate)
 {
     if (isUndefinedOrNull(value)) {
         ports.resize(0);
         return true;
     }
     if (!value->IsArray()) {
-        throwUninformativeAndGenericTypeError(isolate);
+        throwTypeError(ExceptionMessages::notASequenceTypeProperty(propertyName), isolate);
         return false;
     }
     bool success = false;
-    ports = toRefPtrNativeArray<MessagePort, V8MessagePort>(value, isolate, &success);
+    ports = toRefPtrNativeArray<MessagePort, V8MessagePort>(value, propertyName, isolate, &success);
     return success;
 }
 
+bool getMessagePortArray(v8::Local<v8::Value> value, int argumentIndex, MessagePortArray& ports, v8::Isolate* isolate)
+{
+    if (isUndefinedOrNull(value)) {
+        ports.resize(0);
+        return true;
+    }
+    if (!value->IsArray()) {
+        throwTypeError(ExceptionMessages::notASequenceTypeArgumentOrValue(argumentIndex), isolate);
+        return false;
+    }
+    bool success = false;
+    ports = toRefPtrNativeArray<MessagePort, V8MessagePort>(value, argumentIndex, isolate, &success);
+    return success;
+}
+
 void removeHiddenDependency(v8::Handle<v8::Object> object, v8::Local<v8::Value> value, int cacheIndex, v8::Isolate* isolate)
 {
     v8::Local<v8::Value> cache = object->GetInternalField(cacheIndex);
     if (!cache->IsArray())
         return;
     v8::Local<v8::Array> cacheArray = v8::Local<v8::Array>::Cast(cache);
     for (int i = cacheArray->Length() - 1; i >= 0; --i) {
         v8::Local<v8::Value> cached = cacheArray->Get(v8::Integer::New(i, isolate));
         if (cached->StrictEquals(value)) {
             cacheArray->Delete(i);
@@ skipping 19 matching lines @@
 
 ExecutionContext* getExecutionContext()
 {
     if (WorkerScriptController* controller = WorkerScriptController::controllerForContext())
         return &controller->workerGlobalScope();
 
     return currentDocument();
 }
 
 } // namespace WebCore