Merge 119158

Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp

 /*
  * Copyright (C) 2007-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 25 matching lines @@
 #include "ExceptionCode.h"
 #include "Node.h"
 #include "TouchList.h"
 #include "XPathNSResolver.h"
 #include "XPathResult.h"
 
 #include "V8Binding.h"
 #include "V8CanvasRenderingContext2D.h"
 #include "V8CustomXPathNSResolver.h"
 #include "V8DOMImplementation.h"
+#include "V8DOMWrapper.h"
 #include "V8HTMLDocument.h"
 #include "V8IsolatedContext.h"
 #include "V8Node.h"
 #include "V8Proxy.h"
 #include "V8Touch.h"
 #include "V8TouchList.h"
 #if ENABLE(WEBGL)
 #include "V8WebGLRenderingContext.h"
 #endif
 #include "V8XPathNSResolver.h"
@@ skipping 79 matching lines @@
     }
     return wrapper;
 }
 
 #if ENABLE(TOUCH_EVENTS)
 v8::Handle<v8::Value> V8Document::createTouchListCallback(const v8::Arguments& args)
 {
     RefPtr<TouchList> touchList = TouchList::create();
 
     for (int i = 0; i < args.Length(); i++) {
-        if (!args[i]->IsObject())
-            return v8::Undefined();
-        touchList->append(V8Touch::toNative(args[i]->ToObject()));
+        Touch* touch = V8DOMWrapper::isWrapperOfType(args[i], &V8Touch::info) ? V8Touch::toNative(args[i]->ToObject()) : 0;
+        touchList->append(touch);
     }
 
     return toV8(touchList.release(), args.GetIsolate());
 }
 #endif
 
 } // namespace WebCore