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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 2925883003: [Touch Adjustment] Pass primary_pointer_type to WebGestureEvent and disable adjustment for stylus (Closed)
Patch Set: jochen and dtapuska's comments: Add default value Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 1357
1358 bool EventHandler::IsScrollbarHandlingGestures() const { 1358 bool EventHandler::IsScrollbarHandlingGestures() const {
1359 return scroll_manager_->IsScrollbarHandlingGestures(); 1359 return scroll_manager_->IsScrollbarHandlingGestures();
1360 } 1360 }
1361 1361
1362 bool EventHandler::ShouldApplyTouchAdjustment( 1362 bool EventHandler::ShouldApplyTouchAdjustment(
1363 const WebGestureEvent& event) const { 1363 const WebGestureEvent& event) const {
1364 if (frame_->GetSettings() && 1364 if (frame_->GetSettings() &&
1365 !frame_->GetSettings()->GetTouchAdjustmentEnabled()) 1365 !frame_->GetSettings()->GetTouchAdjustmentEnabled())
1366 return false; 1366 return false;
1367
1368 if (event.primary_pointer_type == WebPointerProperties::PointerType::kPen)
1369 return false;
1370
1367 return !event.TapAreaInRootFrame().IsEmpty(); 1371 return !event.TapAreaInRootFrame().IsEmpty();
1368 } 1372 }
1369 1373
1370 bool EventHandler::BestClickableNodeForHitTestResult( 1374 bool EventHandler::BestClickableNodeForHitTestResult(
1371 const HitTestResult& result, 1375 const HitTestResult& result,
1372 IntPoint& target_point, 1376 IntPoint& target_point,
1373 Node*& target_node) { 1377 Node*& target_node) {
1374 // FIXME: Unify this with the other best* functions which are very similar. 1378 // FIXME: Unify this with the other best* functions which are very similar.
1375 1379
1376 TRACE_EVENT0("input", "EventHandler::bestClickableNodeForHitTestResult"); 1380 TRACE_EVENT0("input", "EventHandler::bestClickableNodeForHitTestResult");
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
2092 MouseEventWithHitTestResults& mev, 2096 MouseEventWithHitTestResults& mev,
2093 LocalFrame* subframe) { 2097 LocalFrame* subframe) {
2094 WebInputEventResult result = 2098 WebInputEventResult result =
2095 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); 2099 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event());
2096 if (result != WebInputEventResult::kNotHandled) 2100 if (result != WebInputEventResult::kNotHandled)
2097 return result; 2101 return result;
2098 return WebInputEventResult::kHandledSystem; 2102 return WebInputEventResult::kHandledSystem;
2099 } 2103 }
2100 2104
2101 } // namespace blink 2105 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698