diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-12 14:04:52 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-12 14:04:52 +0100 |
| commit | fd3864ec9aa8cde804c27b9381b4e8a73ccf6583 (patch) | |
| tree | b31d1ef0bbed97771d607da5afc5b7850f6fc8f9 /WebCore/dom/Node.h | |
| parent | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (diff) | |
| download | external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.zip external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.tar.gz external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.tar.bz2 | |
dom, html and loader merges
Diffstat (limited to 'WebCore/dom/Node.h')
| -rw-r--r-- | WebCore/dom/Node.h | 3 |
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; |