webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 22 deletions

diff --git a/Source/WebCore/bindings/js/JSEventCustom.cpp b/Source/WebCore/bindings/js/JSEventCustom.cpp
index e1698db17..72917973f 100644
--- a/Source/WebCore/bindings/js/JSEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSEventCustom.cpp
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -29,45 +29,35 @@
 #include "config.h"
 #include "JSEvent.h"
 
-#include "Clipboard.h"
+#include "DataTransfer.h"
 #include "Event.h"
 #include "EventHeaders.h"
 #include "EventInterfaces.h"
-#include "EventNames.h"
-#include "JSClipboard.h"
+#include "JSDOMBinding.h"
+#include "JSDataTransfer.h"
 #include <runtime/JSLock.h>
-#include <wtf/HashMap.h>
 #include <wtf/text/AtomicString.h>
 
 using namespace JSC;
 
 namespace WebCore {
 
-JSValue JSEvent::clipboardData(ExecState* exec) const
-{
-    return impl().isClipboardEvent() ? toJS(exec, globalObject(), impl().clipboardData()) : jsUndefined();
-}
-
 #define TRY_TO_WRAP_WITH_INTERFACE(interfaceName) \
     case interfaceName##InterfaceType: \
-        return CREATE_DOM_WRAPPER(exec, globalObject, interfaceName, event);
+        return createWrapper<interfaceName>(globalObject, WTFMove(event));
 
-JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event)
+JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Ref<Event>&& event)
 {
-    JSLockHolder lock(exec);
-
-    if (!event)
-        return jsNull();
-
-    JSObject* wrapper = getCachedWrapper(currentWorld(exec), event);
-    if (wrapper)
-        return wrapper;
-
     switch (event->eventInterface()) {
         DOM_EVENT_INTERFACES_FOR_EACH(TRY_TO_WRAP_WITH_INTERFACE)
     }
 
-    return CREATE_DOM_WRAPPER(exec, globalObject, Event, event);
+    return createWrapper<Event>(globalObject, WTFMove(event));
+}
+
+JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, Event& event)
+{
+    return wrap(state, globalObject, event);
 }
 
 #undef TRY_TO_WRAP_WITH_INTERFACE