Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(586)

Unified Diff: sky/engine/web/WebViewImpl.cpp

Issue 868133003: Remove touch events from Sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/web/WebViewImpl.h ('k') | sky/examples/touch-demo.sky » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/WebViewImpl.cpp
diff --git a/sky/engine/web/WebViewImpl.cpp b/sky/engine/web/WebViewImpl.cpp
index 1cfc2343f7fc5cd6ba1f6da95edeea5bb205fefb..a345085b8d21764424bc062b6df6c6ba6f815f48 100644
--- a/sky/engine/web/WebViewImpl.cpp
+++ b/sky/engine/web/WebViewImpl.cpp
@@ -169,11 +169,6 @@ WebLocalFrameImpl* WebViewImpl::mainFrameImpl()
return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0;
}
-bool WebViewImpl::handleTouchEvent(LocalFrame& mainFrame, const WebTouchEvent& event)
-{
- return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(mainFrame.view(), event));
-}
-
bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
{
bool eventSwallowed = false;
@@ -543,14 +538,6 @@ static String inputTypeToName(WebInputEvent::Type type)
return EventTypeNames::gesturetap;
case WebInputEvent::GestureTapUnconfirmed:
return EventTypeNames::gesturetapunconfirmed;
- case WebInputEvent::TouchStart:
- return EventTypeNames::touchstart;
- case WebInputEvent::TouchMove:
- return EventTypeNames::touchmove;
- case WebInputEvent::TouchEnd:
- return EventTypeNames::touchend;
- case WebInputEvent::TouchCancel:
- return EventTypeNames::touchcancel;
default:
return String("unknown");
}
@@ -567,7 +554,6 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
return m_page->mainFrame()->newEventHandler().handlePointerEvent(event);
}
- LocalFrame* frame = m_page ? m_page->mainFrame() : nullptr;
switch (inputEvent.type) {
case WebInputEvent::RawKeyDown:
case WebInputEvent::KeyDown:
@@ -593,14 +579,6 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
case WebInputEvent::GestureLongTap:
return handleGestureEvent(static_cast<const WebGestureEvent&>(inputEvent));
- case WebInputEvent::TouchStart:
- case WebInputEvent::TouchMove:
- case WebInputEvent::TouchEnd:
- case WebInputEvent::TouchCancel:
- if (!frame || !frame->view())
- return false;
- return handleTouchEvent(*frame, static_cast<const WebTouchEvent&>(inputEvent));
-
case WebInputEvent::GesturePinchBegin:
case WebInputEvent::GesturePinchEnd:
case WebInputEvent::GesturePinchUpdate:
« no previous file with comments | « sky/engine/web/WebViewImpl.h ('k') | sky/examples/touch-demo.sky » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698