[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:18:53 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0b4f7897a78456512c5776ced98f79916a71e59c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 10 21:34:33 2010 +0000
2010-03-10 Garret Kelly <gdk at chromium.org>
Reviewed by Darin Fisher.
Adding all of the touch-related sources into Chromium's WebCore build.
https://bugs.webkit.org/show_bug.cgi?id=35874
Patch tested against the try bots, but the feature is exercised in the
fast/events/touch tests.
* WebCore.gypi:
2010-03-10 Garret Kelly <gdk at chromium.org>
Reviewed by Darin Fisher.
Add support for converting WebTouchEvents to PlatformTouchEvents and
routing them into the EventHandler for the frame in which they
originate.
https://bugs.webkit.org/show_bug.cgi?id=35874
* src/ChromeClientImpl.h:
(WebKit::ChromeClientImpl::needTouchEvents):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::touchEvent): Handle incoming WebTouchEvents,
converting them to PlatformTouchEvents and sending them to the
EventHandler.
(WebKit::WebViewImpl::handleInputEvent): Now routes WebTouchEvents to
the touchEvent handler.
* src/WebViewImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0368702..610865b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-10 Garret Kelly <gdk at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Adding all of the touch-related sources into Chromium's WebCore build.
+ https://bugs.webkit.org/show_bug.cgi?id=35874
+
+ Patch tested against the try bots, but the feature is exercised in the
+ fast/events/touch tests.
+
+ * WebCore.gypi:
+
2010-03-10 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 51470ae..be547ec 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1204,6 +1204,11 @@
'dom/Text.h',
'dom/TextEvent.cpp',
'dom/TextEvent.h',
+ 'dom/Touch.cpp',
+ 'dom/Touch.h',
+ 'dom/TouchEvent.cpp',
+ 'dom/TouchList.cpp',
+ 'dom/TouchList.h',
'dom/Tokenizer.h',
'dom/TransformSourceLibxslt.cpp',
'dom/TransformSource.h',
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 28e7c87..79f3f52 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-03-10 Garret Kelly <gdk at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Add support for converting WebTouchEvents to PlatformTouchEvents and
+ routing them into the EventHandler for the frame in which they
+ originate.
+ https://bugs.webkit.org/show_bug.cgi?id=35874
+
+ * src/ChromeClientImpl.h:
+ (WebKit::ChromeClientImpl::needTouchEvents):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::touchEvent): Handle incoming WebTouchEvents,
+ converting them to PlatformTouchEvents and sending them to the
+ EventHandler.
+ (WebKit::WebViewImpl::handleInputEvent): Now routes WebTouchEvents to
+ the touchEvent handler.
+ * src/WebViewImpl.h:
+
2010-03-10 Nate Chapin <japhet at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index 3e2f692..a369f49 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -129,6 +129,10 @@ public:
virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }
virtual void formStateDidChange(const WebCore::Node*);
virtual PassOwnPtr<WebCore::HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
+#if ENABLE(TOUCH_EVENTS)
+ // FIXME: All touch events are forwarded regardless of whether or not they are needed.
+ virtual void needTouchEvents(bool needTouchEvents) { }
+#endif
// ChromeClientChromium methods:
virtual void popupOpened(WebCore::PopupContainer* popupContainer,
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 1e4f274..a6db418 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -612,6 +612,17 @@ bool WebViewImpl::charEvent(const WebKeyboardEvent& event)
return true;
}
+#if ENABLE(TOUCH_EVENTS)
+bool WebViewImpl::touchEvent(const WebTouchEvent& event)
+{
+ if (!mainFrameImpl() || !mainFrameImpl()->frameView())
+ return false;
+
+ PlatformTouchEventBuilder touchEventBuilder(mainFrameImpl()->frameView(), event);
+ return mainFrameImpl()->frame()->eventHandler()->handleTouchEvent(touchEventBuilder);
+}
+#endif
+
// The WebViewImpl::SendContextMenuEvent function is based on the Webkit
// function
// bool WebView::handleContextMenuEvent(WPARAM wParam, LPARAM lParam) in
@@ -972,6 +983,15 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
handled = charEvent(*static_cast<const WebKeyboardEvent*>(&inputEvent));
break;
+#if ENABLE(TOUCH_EVENTS)
+ case WebInputEvent::TouchStart:
+ case WebInputEvent::TouchMove:
+ case WebInputEvent::TouchEnd:
+ case WebInputEvent::TouchCancel:
+ handled = touchEvent(*static_cast<const WebTouchEvent*>(&inputEvent));
+ break;
+#endif
+
default:
handled = false;
}
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index a913115..b3866c0 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -76,6 +76,7 @@ class WebKeyboardEvent;
class WebMouseEvent;
class WebMouseWheelEvent;
class WebSettingsImpl;
+class WebTouchEvent;
class WebViewImpl : public WebView, public RefCounted<WebViewImpl> {
public:
@@ -229,6 +230,7 @@ public:
void mouseWheel(const WebMouseWheelEvent&);
bool keyEvent(const WebKeyboardEvent&);
bool charEvent(const WebKeyboardEvent&);
+ bool touchEvent(const WebTouchEvent&);
// Handles context menu events orignated via the the keyboard. These
// include the VK_APPS virtual key and the Shift+F10 combine. Code is
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list