Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/bindings/js/JSEventTarget.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * 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 "JSEventTarget.h"
 
 #include "Document.h"
 #include "JSEventListener.h"
+#include "JSEventTargetNode.h"
 #include "JSMessagePort.h"
-#include "JSNode.h"
-#include "JSXMLHttpRequest.h"
+#include "JSWorker.h"
+#include "JSWorkerContext.h"
 #include "JSXMLHttpRequestUpload.h"
-#include "MessagePort.h"
-#include "XMLHttpRequest.h"
-#include "XMLHttpRequestUpload.h"
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "DOMApplicationCache.h"
-#include "JSDOMApplicationCache.h"
-#endif
+#include "Worker.h"
+#include "WorkerContext.h"
 
 #if ENABLE(SVG)
 #include "SVGElementInstance.h"
 #include "JSSVGElementInstance.h"
 #endif
 
-#if ENABLE(WORKERS)
-#include "JSWorker.h"
-#include "JSWorkerContext.h"
-#include "Worker.h"
-#include "WorkerContext.h"
-#endif
-
 using namespace JSC;
 
 namespace WebCore {
 
 JSValuePtr toJS(ExecState* exec, EventTarget* target)
 {
     if (!target)
         return jsNull();
     
 #if ENABLE(SVG)
@@ skipping 26 matching lines @@
         return toJS(exec, worker);
 
     if (WorkerContext* workerContext = target->toWorkerContext())
         return toJSDOMGlobalObject(workerContext);
 #endif
 
     ASSERT_NOT_REACHED();
     return jsNull();
 }
 
-EventTarget* toEventTarget(JSC::JSValuePtr value)
-{
-    #define CONVERT_TO_EVENT_TARGET(type) \
-        if (value.isObject(&JS##type::s_info)) \
-            return static_cast<JS##type*>(asObject(value))->impl();
-
-    CONVERT_TO_EVENT_TARGET(Node)
-    CONVERT_TO_EVENT_TARGET(XMLHttpRequest)
-    CONVERT_TO_EVENT_TARGET(XMLHttpRequestUpload)
-    CONVERT_TO_EVENT_TARGET(MessagePort)
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    CONVERT_TO_EVENT_TARGET(DOMApplicationCache)
-#endif
-
-#if ENABLE(SVG)
-    CONVERT_TO_EVENT_TARGET(SVGElementInstance)
-#endif
-
-#if ENABLE(WORKERS)
-    CONVERT_TO_EVENT_TARGET(Worker)
-    CONVERT_TO_EVENT_TARGET(WorkerContext)
-#endif
-
-    return 0;
-}
-
 } // namespace WebCore