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

Unified Diff: sky/engine/public/sky/sky_view.cc

Issue 1143343004: Rationalise hit testing in the new RenderNode world (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 7 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
Index: sky/engine/public/sky/sky_view.cc
diff --git a/sky/engine/public/sky/sky_view.cc b/sky/engine/public/sky/sky_view.cc
index 117d2c47728a18c64937e4a8ebcd1d945009c6a5..45edf46a2737ae170f96551a30a07ea01a624c3a 100644
--- a/sky/engine/public/sky/sky_view.cc
+++ b/sky/engine/public/sky/sky_view.cc
@@ -68,30 +68,23 @@ skia::RefPtr<SkPicture> SkyView::Paint() {
return skia::RefPtr<SkPicture>();
}
-bool SkyView::HandleInputEvent(const WebInputEvent& inputEvent) {
+void SkyView::HandleInputEvent(const WebInputEvent& inputEvent) {
TRACE_EVENT0("input", "SkyView::HandleInputEvent");
if (WebInputEvent::isPointerEventType(inputEvent.type)) {
const WebPointerEvent& event = static_cast<const WebPointerEvent&>(inputEvent);
- return data_->view_->handleInputEvent(PointerEvent::create(event));
- }
-
- if (WebInputEvent::isGestureEventType(inputEvent.type)) {
+ data_->view_->handleInputEvent(PointerEvent::create(event));
+ } else if (WebInputEvent::isGestureEventType(inputEvent.type)) {
const WebGestureEvent& event = static_cast<const WebGestureEvent&>(inputEvent);
- return data_->view_->handleInputEvent(GestureEvent::create(event));
- }
-
- if (WebInputEvent::isKeyboardEventType(inputEvent.type)) {
+ data_->view_->handleInputEvent(GestureEvent::create(event));
+ } else if (WebInputEvent::isKeyboardEventType(inputEvent.type)) {
const WebKeyboardEvent& event = static_cast<const WebKeyboardEvent&>(inputEvent);
- return data_->view_->handleInputEvent(KeyboardEvent::create(event));
- }
-
- if (WebInputEvent::isWheelEventType(inputEvent.type)) {
+ data_->view_->handleInputEvent(KeyboardEvent::create(event));
+ } else if (WebInputEvent::isWheelEventType(inputEvent.type)) {
const WebWheelEvent& event = static_cast<const WebWheelEvent&>(inputEvent);
- return data_->view_->handleInputEvent(WheelEvent::create(event));
+ data_->view_->handleInputEvent(WheelEvent::create(event));
}
- return false;
}
void SkyView::ScheduleFrame() {

Powered by Google App Engine
This is Rietveld 408576698