OLD | NEW |
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 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1401 | 1401 |
1402 bool EventHandler::IsScrollbarHandlingGestures() const { | 1402 bool EventHandler::IsScrollbarHandlingGestures() const { |
1403 return scroll_manager_->IsScrollbarHandlingGestures(); | 1403 return scroll_manager_->IsScrollbarHandlingGestures(); |
1404 } | 1404 } |
1405 | 1405 |
1406 bool EventHandler::ShouldApplyTouchAdjustment( | 1406 bool EventHandler::ShouldApplyTouchAdjustment( |
1407 const WebGestureEvent& event) const { | 1407 const WebGestureEvent& event) const { |
1408 if (frame_->GetSettings() && | 1408 if (frame_->GetSettings() && |
1409 !frame_->GetSettings()->GetTouchAdjustmentEnabled()) | 1409 !frame_->GetSettings()->GetTouchAdjustmentEnabled()) |
1410 return false; | 1410 return false; |
| 1411 |
| 1412 if (event.primary_pointer_type == WebPointerProperties::PointerType::kPen) |
| 1413 return false; |
| 1414 |
1411 return !event.TapAreaInRootFrame().IsEmpty(); | 1415 return !event.TapAreaInRootFrame().IsEmpty(); |
1412 } | 1416 } |
1413 | 1417 |
1414 bool EventHandler::BestClickableNodeForHitTestResult( | 1418 bool EventHandler::BestClickableNodeForHitTestResult( |
1415 const HitTestResult& result, | 1419 const HitTestResult& result, |
1416 IntPoint& target_point, | 1420 IntPoint& target_point, |
1417 Node*& target_node) { | 1421 Node*& target_node) { |
1418 // FIXME: Unify this with the other best* functions which are very similar. | 1422 // FIXME: Unify this with the other best* functions which are very similar. |
1419 | 1423 |
1420 TRACE_EVENT0("input", "EventHandler::bestClickableNodeForHitTestResult"); | 1424 TRACE_EVENT0("input", "EventHandler::bestClickableNodeForHitTestResult"); |
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2148 MouseEventWithHitTestResults& mev, | 2152 MouseEventWithHitTestResults& mev, |
2149 LocalFrame* subframe) { | 2153 LocalFrame* subframe) { |
2150 WebInputEventResult result = | 2154 WebInputEventResult result = |
2151 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); | 2155 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); |
2152 if (result != WebInputEventResult::kNotHandled) | 2156 if (result != WebInputEventResult::kNotHandled) |
2153 return result; | 2157 return result; |
2154 return WebInputEventResult::kHandledSystem; | 2158 return WebInputEventResult::kHandledSystem; |
2155 } | 2159 } |
2156 | 2160 |
2157 } // namespace blink | 2161 } // namespace blink |
OLD | NEW |