diff options
Diffstat (limited to 'WebCore/dom/Event.h')
| -rw-r--r-- | WebCore/dom/Event.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/dom/Event.h b/WebCore/dom/Event.h index 2e7f376..85d4cb2 100644 --- a/WebCore/dom/Event.h +++ b/WebCore/dom/Event.h @@ -119,10 +119,17 @@ namespace WebCore { #if ENABLE(DOM_STORAGE) virtual bool isStorageEvent() const; #endif +#ifdef MANUAL_MERGE_REQUIRED #if ENABLE(TOUCH_EVENTS) // Android virtual bool isTouchEvent() const; #endif +#else // MANUAL_MERGE_REQUIRED +#if ENABLE(WORKERS) + virtual bool isErrorEvent() const; +#endif + +#endif // MANUAL_MERGE_REQUIRED bool propagationStopped() const { return m_propagationStopped; } bool defaultPrevented() const { return m_defaultPrevented; } |