summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/Node.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/dom/Node.h')
-rw-r--r--WebCore/dom/Node.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h
index 22eb848..af8a8ce 100644
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -658,7 +658,6 @@ public:
void setOnsearch(PassRefPtr<EventListener>);
EventListener* onselectstart() const;
void setOnselectstart(PassRefPtr<EventListener>);
-#ifdef MANUAL_MERGE_REQUIRED
EventListener* onsubmit() const;
void setOnsubmit(PassRefPtr<EventListener>);
EventListener* onunload() const;
@@ -673,8 +672,6 @@ public:
EventListener* ontouchcancel() const;
void setOntouchcancel(PassRefPtr<EventListener>);
#endif
-#else // MANUAL_MERGE_REQUIRED
-#endif // MANUAL_MERGE_REQUIRED
using TreeShared<Node>::ref;
using TreeShared<Node>::deref;