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