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/Event.cpp | |
| 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/Event.cpp')
| -rw-r--r-- | WebCore/dom/Event.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/dom/Event.cpp b/WebCore/dom/Event.cpp index 2feef9a..4ad090b 100644 --- a/WebCore/dom/Event.cpp +++ b/WebCore/dom/Event.cpp @@ -158,7 +158,6 @@ bool Event::isStorageEvent() const } #endif -#ifdef MANUAL_MERGE_REQUIRED #if ENABLE(TOUCH_EVENTS) // Android bool Event::isTouchEvent() const { @@ -166,15 +165,13 @@ bool Event::isTouchEvent() const } #endif -#else // MANUAL_MERGE_REQUIRED #if ENABLE(WORKERS) bool Event::isErrorEvent() const { return false; } #endif - -#endif // MANUAL_MERGE_REQUIRED + bool Event::storesResultAsString() const { return false; |