Reverting 9394.

Relanding merge for the third time. Darin will fix mac build.
Review URL: http://codereview.chromium.org/20183

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9395 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 13 insertions, 23 deletions

diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index f1cf49d..75d28ef 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -659,7 +659,6 @@ all : \
     V8EntityReference.h \
     V8Event.h \
     V8EventException.h \
-    V8EventTargetNode.h \
     V8File.h \
     V8FileList.h \
     V8HTMLAnchorElement.h \
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index f9000a2..dc37a04 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -1644,7 +1644,7 @@ sub GetNativeType
     return "SVGPaint::SVGPaintType" if $type eq "SVGPaintType";
     return "DOMTimeStamp" if $type eq "DOMTimeStamp";
     return "unsigned" if $type eq "RGBColor";
-    return "EventTargetNode*" if $type eq "EventTarget" and $isParameter;
+    return "Node*" if $type eq "EventTarget" and $isParameter;
 
     return "String" if $type eq "DOMUserData";  # temporary hack, TODO
 
@@ -1763,7 +1763,7 @@ sub JSValueToNative
       $implIncludes{"V8Node.h"} = 1;
 
       # EventTarget is not in DOM hierarchy, but all Nodes are EventTarget.
-      return "V8Node::HasInstance($value) ? V8Proxy::DOMWrapperToNode<EventTargetNode>($value) : 0";
+      return "V8Node::HasInstance($value) ? V8Proxy::DOMWrapperToNode<Node>($value) : 0";
     }
 
     AddIncludesForType($type);
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index 0e58572..914ebaf 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -62,7 +62,6 @@
 #include "Event.h"
 #include "EventListener.h"
 #include "EventTarget.h"
-#include "EventTargetNode.h"
 #include "ExceptionCode.h"
 #include "FloatRect.h"
 #include "Frame.h"
@@ -2888,12 +2887,11 @@ CALLBACK_FUNC_DECL(DOMWindowNOP)
 }
 
 
-// EventTargetNode -------------------------------------------------------------
+// Node -------------------------------------------------------------
 
-CALLBACK_FUNC_DECL(EventTargetNodeAddEventListener) {
-  INC_STATS("DOM.EventTargetNode.addEventListener()");
-  EventTargetNode* node =
-      V8Proxy::DOMWrapperToNode<EventTargetNode>(args.Holder());
+CALLBACK_FUNC_DECL(NodeAddEventListener) {
+  INC_STATS("DOM.Node.addEventListener()");
+  Node* node = V8Proxy::DOMWrapperToNode<Node>(args.Holder());
 
   V8Proxy* proxy = V8Proxy::retrieve(node->document()->frame());
   if (!proxy)
@@ -2909,10 +2907,9 @@ CALLBACK_FUNC_DECL(EventTargetNodeAddEventListener) {
   return v8::Undefined();
 }
 
-CALLBACK_FUNC_DECL(EventTargetNodeRemoveEventListener) {
-  INC_STATS("DOM.EventTargetNode.removeEventListener()");
-  EventTargetNode* node =
-      V8Proxy::DOMWrapperToNode<EventTargetNode>(args.Holder());
+CALLBACK_FUNC_DECL(NodeRemoveEventListener) {
+  INC_STATS("DOM.Node.removeEventListener()");
+  Node* node = V8Proxy::DOMWrapperToNode<Node>(args.Holder());
 
   V8Proxy* proxy = V8Proxy::retrieve(node->document()->frame());
   // It is possbile that the owner document of the node is detached
@@ -3192,8 +3189,7 @@ ACCESSOR_GETTER(DOMWindowEventHandler) {
 
 
 ACCESSOR_SETTER(ElementEventHandler) {
-  EventTargetNode* node =
-      V8Proxy::DOMWrapperToNode<EventTargetNode>(info.Holder());
+  Node* node = V8Proxy::DOMWrapperToNode<Node>(info.Holder());
 
   // Name starts with 'on', remove them.
   String key = ToWebCoreString(name);
@@ -3223,8 +3219,7 @@ ACCESSOR_SETTER(ElementEventHandler) {
 
 
 ACCESSOR_GETTER(ElementEventHandler) {
-  EventTargetNode* node =
-      V8Proxy::DOMWrapperToNode<EventTargetNode>(info.Holder());
+  Node* node = V8Proxy::DOMWrapperToNode<Node>(info.Holder());
 
   // Name starts with 'on', remove them.
   String key = ToWebCoreString(name);
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index 99eeca3..72f9979 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -309,8 +309,8 @@ DECLARE_CALLBACK(LocationValueOf)
 
 // Implementation of EventTarget::addEventListener
 // and EventTarget::removeEventListener
-DECLARE_CALLBACK(EventTargetNodeAddEventListener)
-DECLARE_CALLBACK(EventTargetNodeRemoveEventListener)
+DECLARE_CALLBACK(NodeAddEventListener)
+DECLARE_CALLBACK(NodeRemoveEventListener)
 
 // Custom implementation is Navigator properties.
 // We actually only need this because WebKit has
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 5eb1f81..9f93a93 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -153,7 +153,6 @@
 #include "V8DOMWindow.h"
 #include "V8Event.h"
 #include "V8EventException.h"
-#include "V8EventTargetNode.h"
 #include "V8KeyboardEvent.h"
 #include "V8MouseEvent.h"
 #include "V8WebKitAnimationEvent.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 0f6fc1f..d388116 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -45,7 +45,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
   V(ELEMENT, Element)                                                   \
   V(ENTITY, Entity)                                                     \
   V(ENTITYREFERENCE, EntityReference)                                   \
-  V(EVENTTARGETNODE, EventTargetNode)                                   \
   V(HTMLDOCUMENT, HTMLDocument)                                         \
   V(NODE, Node)                                                         \
   V(NOTATION, Notation)                                                 \
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 3bbbe21..4a76163 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -79,7 +79,6 @@
 #include "DOMWindow.h"
 #include "Entity.h"
 #include "EventListener.h"
-#include "EventTargetNode.h"
 #include "EventTarget.h"
 #include "Event.h"
 #include "EventException.h"
diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h
index 31bdc40..772489f 100644
--- a/webkit/port/bindings/v8/v8_proxy.h
+++ b/webkit/port/bindings/v8/v8_proxy.h
@@ -56,7 +56,6 @@ class MimeType;
 class MimeTypeArray;
 class Plugin;
 class PluginArray;
-class EventTargetNode;
 class StyleSheetList;
 class CSSValue;
 class CSSRule;