diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/dom/Event.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/dom/Event.cpp')
| -rw-r--r-- | WebCore/dom/Event.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/WebCore/dom/Event.cpp b/WebCore/dom/Event.cpp index 53242b6..2feef9a 100644 --- a/WebCore/dom/Event.cpp +++ b/WebCore/dom/Event.cpp @@ -158,6 +158,7 @@ bool Event::isStorageEvent() const } #endif +#ifdef MANUAL_MERGE_REQUIRED #if ENABLE(TOUCH_EVENTS) // Android bool Event::isTouchEvent() const { @@ -165,6 +166,15 @@ 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; |