Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 56 insertions, 12 deletions

diff --git a/WebCore/bindings/cpp/WebDOMEventTarget.cpp b/WebCore/bindings/cpp/WebDOMEventTarget.cpp
index 2eaef00..b24bc84 100644
--- a/WebCore/bindings/cpp/WebDOMEventTarget.cpp
+++ b/WebCore/bindings/cpp/WebDOMEventTarget.cpp
@@ -22,6 +22,7 @@
 #include "WebDOMEventTarget.h"
 
 #include "DOMApplicationCache.h"
+#include "DOMWindow.h"
 #include "DedicatedWorkerContext.h"
 #include "EventSource.h"
 #include "MessagePort.h"
@@ -31,6 +32,7 @@
 #include "SharedWorkerContext.h"
 #include "ThreadCheck.h"
 #include "WebDOMDOMApplicationCache.h"
+#include "WebDOMDOMWindow.h"
 #include "WebDOMDedicatedWorkerContext.h"
 #include "WebDOMEventSource.h"
 #include "WebDOMMessagePort.h"
@@ -88,6 +90,45 @@ WebCore::EventTarget* WebDOMEventTarget::impl() const
     return m_impl ? m_impl->impl.get() : 0;
 }
 
+#define ConvertTo(type) \
+WebDOM##type WebDOMEventTarget::to##type() \
+{ \
+    WebCore::EventTarget* target = impl(); \
+    return WebDOM##type(target ? target->to##type() : 0); \
+}
+
+ConvertTo(Node)
+ConvertTo(DOMWindow)
+ConvertTo(XMLHttpRequest)
+ConvertTo(XMLHttpRequestUpload)
+ConvertTo(MessagePort)
+
+#if ENABLE(EVENTSOURCE)
+ConvertTo(EventSource)
+#endif
+
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+ConvertTo(DOMApplicationCache)
+#endif
+
+#if ENABLE(WORKERS)
+ConvertTo(Worker)
+ConvertTo(DedicatedWorkerContext)
+#endif
+
+#if ENABLE(SHARED_WORKERS)
+ConvertTo(SharedWorker)
+ConvertTo(SharedWorkerContext)
+#endif
+
+#if ENABLE(NOTIFICATIONS)
+ConvertTo(Notification)
+#endif
+
+#if ENABLE(WEB_SOCKETS)
+ConvertTo(WebSocket)
+#endif
+
 WebCore::EventTarget* toWebCore(const WebDOMEventTarget& wrapper)
 {
     return wrapper.impl();
@@ -95,6 +136,21 @@ WebCore::EventTarget* toWebCore(const WebDOMEventTarget& wrapper)
 
 WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
 {
+    if (WebCore::Node* node = value->toNode())
+        return toWebKit(node);
+
+    if (WebCore::DOMWindow* window = value->toDOMWindow())
+        return toWebKit(window);
+
+    if (WebCore::XMLHttpRequest* xhr = value->toXMLHttpRequest())
+        return toWebKit(xhr);
+
+    if (WebCore::XMLHttpRequestUpload* upload = value->toXMLHttpRequestUpload())
+        return toWebKit(upload);
+
+    if (WebCore::MessagePort* messagePort = value->toMessagePort())
+        return toWebKit(messagePort);
+
 #if ENABLE(EVENTSOURCE)
     if (WebCore::EventSource* eventSource = value->toEventSource())
         return toWebKit(eventSource);
@@ -107,23 +163,11 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
         return toWebKit(instance);
 #endif
 
-    if (WebCore::Node* node = value->toNode())
-        return toWebKit(node);
-
-    if (WebCore::XMLHttpRequest* xhr = value->toXMLHttpRequest())
-        return toWebKit(xhr);
-
-    if (WebCore::XMLHttpRequestUpload* upload = value->toXMLHttpRequestUpload())
-        return toWebKit(upload);
-
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (WebCore::DOMApplicationCache* cache = value->toDOMApplicationCache())
         return toWebKit(cache);
 #endif
 
-    if (WebCore::MessagePort* messagePort = value->toMessagePort())
-        return toWebKit(messagePort);
-
 #if ENABLE(WORKERS)
     if (WebCore::Worker* worker = value->toWorker())
         return toWebKit(worker);