diff options
| author | Ben Murdoch <benm@google.com> | 2010-01-27 16:01:43 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-01-29 17:19:39 +0000 |
| commit | bbbd652d61d6ce0613672f3ca33d16b83a25f658 (patch) | |
| tree | 444932c25d663d02049a9f48fdecd3f3cf6f812c /WebCore | |
| parent | 252a2a03072a42da2a090bf0183a503d1da48325 (diff) | |
| download | external_webkit-bbbd652d61d6ce0613672f3ca33d16b83a25f658.zip external_webkit-bbbd652d61d6ce0613672f3ca33d16b83a25f658.tar.gz external_webkit-bbbd652d61d6ce0613672f3ca33d16b83a25f658.tar.bz2 | |
Cherry pick the diff after going through review on webkit.org bug for 34215 (implementing ChromeClient::needTouchEvents). Landed as r54069. We just needed to add an ifdef guard.
Change-Id: If3fa0398e756508a718d5d3d93a5dd322a5e3f01
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/dom/Document.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 5bae60e..48d701e 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -3105,6 +3105,7 @@ void Document::addListenerTypeIfNeeded(const AtomicString& eventType) addListenerType(TRANSITIONEND_LISTENER); else if (eventType == eventNames().beforeloadEvent) addListenerType(BEFORELOAD_LISTENER); +#if ENABLE(TOUCH_EVENTS) else if (eventType == eventNames().touchstartEvent || eventType == eventNames().touchmoveEvent || eventType == eventNames().touchendEvent @@ -3113,6 +3114,7 @@ void Document::addListenerTypeIfNeeded(const AtomicString& eventType) if (Page* page = this->page()) page->chrome()->client()->needTouchEvents(true); } +#endif } CSSStyleDeclaration* Document::getOverrideStyle(Element*, const String&) |