ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/core/events/EventTarget.h

Index: third_party/WebKit/Source/core/events/EventTarget.h
diff --git a/third_party/WebKit/Source/core/events/EventTarget.h b/third_party/WebKit/Source/core/events/EventTarget.h
index bf395f1ddb60d5877335c379ef160021355c6f45..96e8bddd34c29e2d42041fb5d2ddd097e8a66a5f 100644
--- a/third_party/WebKit/Source/core/events/EventTarget.h
+++ b/third_party/WebKit/Source/core/events/EventTarget.h
@@ -243,6 +243,8 @@ class GC_PLUGIN_IGNORE("513199") CORE_EXPORT EventTargetWithInlineData
 // FIXME: These macros should be split into separate DEFINE and DECLARE
 // macros to avoid causing so many header includes.
 #define DEFINE_ATTRIBUTE_EVENT_LISTENER(attribute)                        \
+  /* DO NOT SUBMIT - merge conflicts marker */
+  /* Below we should have |on##|, and |setOn| (not |SetOn##| or |On##|) */
   EventListener* on##attribute() {                                        \
     return this->getAttributeEventListener(EventTypeNames::attribute);    \
   }                                                                       \
@@ -251,6 +253,8 @@ class GC_PLUGIN_IGNORE("513199") CORE_EXPORT EventTargetWithInlineData
   }
 
 #define DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(attribute)                    \
+  /* DO NOT SUBMIT - merge conflicts marker */
+  /* Below we should have |on##|, and |setOn| (not |SetOn##| or |On##|) */
   static EventListener* on##attribute(EventTarget& eventTarget) {            \
     return eventTarget.getAttributeEventListener(EventTypeNames::attribute); \
   }                                                                          \
@@ -261,6 +265,8 @@ class GC_PLUGIN_IGNORE("513199") CORE_EXPORT EventTargetWithInlineData
   }
 
 #define DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(attribute)                 \
+  /* DO NOT SUBMIT - merge conflicts marker */
+  /* Below we should have |on##|, and |setOn| (not |SetOn##| or |On##|) */
   EventListener* on##attribute() {                                        \
     return document().getWindowAttributeEventListener(                    \
         EventTypeNames::attribute);                                       \
@@ -271,6 +277,8 @@ class GC_PLUGIN_IGNORE("513199") CORE_EXPORT EventTargetWithInlineData
   }
 
 #define DEFINE_STATIC_WINDOW_ATTRIBUTE_EVENT_LISTENER(attribute)             \
+  /* DO NOT SUBMIT - merge conflicts marker */
+  /* Below we should have |on##|, and |setOn| (not |SetOn##| or |On##|) */
   static EventListener* on##attribute(EventTarget& eventTarget) {            \
     if (Node* node = eventTarget.toNode())                                   \
       return node->document().getWindowAttributeEventListener(               \
@@ -291,6 +299,8 @@ class GC_PLUGIN_IGNORE("513199") CORE_EXPORT EventTargetWithInlineData
   }
 
 #define DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(attribute, eventName) \
+  /* DO NOT SUBMIT - merge conflicts marker */
+  /* Below we should have |on##|, and |setOn| (not |SetOn##| or |On##|) */
   EventListener* on##attribute() {                                   \
     return getAttributeEventListener(EventTypeNames::eventName);     \
   }                                                                  \