Skip to content

GitLab

T
tangled
Commit b79ea4e4 authored by Liviu Tinta's avatar Liviu Tinta Committed by Commit Bot
Browse files
Options

Pointer Event Capture is not lost when using chorded buttons. 

Add web test for the bug.
Add check in HandleMouseReleaseEvent to release mouse capture only when all the mouse buttons are released.

Bug: 1053385
Change-Id: Id327f67c915b79673e80b1c97d3e6975a3488d50
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2071292
Commit-Queue: Liviu Tinta <liviutinta@chromium.org>
Reviewed-by: default avatarNavid Zolghadr <nzolghadr@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747291}
parent d814c94c
Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 10 deletions
third_party/blink/renderer/core/input/event_handler.cc
View file @ b79ea4e4
......@@ -1115,14 +1115,23 @@ WebInputEventResult EventHandler::HandleMouseReleaseEvent(
mouse_event_manager_->SetMousePositionAndDispatchMouseEvent(
EffectiveMouseEventTargetElement(frame_set_being_resized_.Get()),
String(), event_type_names::kMouseup, mouse_event);
ReleaseMouseCaptureFromLocalRoot();
// crbug.com/1053385 release mouse capture only if there are no more mouse
// buttons depressed
if (MouseEvent::WebInputEventModifiersToButtons(
mouse_event.GetModifiers()) == 0)
ReleaseMouseCaptureFromLocalRoot();
return result;
}
if (last_scrollbar_under_mouse_) {
mouse_event_manager_->InvalidateClick();
last_scrollbar_under_mouse_->MouseUp(mouse_event);
ReleaseMouseCaptureFromLocalRoot();
// crbug.com/1053385 release mouse capture only if there are no more mouse
// buttons depressed
if (MouseEvent::WebInputEventModifiersToButtons(
mouse_event.GetModifiers()) == 0) {
ReleaseMouseCaptureFromLocalRoot();
}
return DispatchMousePointerEvent(
WebInputEvent::kPointerUp, mouse_event_manager_->GetElementUnderMouse(),
String(), mouse_event, Vector<WebMouseEvent>(),
......@@ -1153,14 +1162,19 @@ WebInputEventResult EventHandler::HandleMouseReleaseEvent(
(GetSelectionController().HasExtendedSelection() &&
IsSelectionOverLink(mev)));
}
scroll_manager_->ClearResizeScrollableArea(false);
if (event_result == WebInputEventResult::kNotHandled)
event_result = mouse_event_manager_->HandleMouseReleaseEvent(mev);
mouse_event_manager_->HandleMouseReleaseEventUpdateStates();
ReleaseMouseCaptureFromLocalRoot();
// crbug.com/1053385 release mouse capture only if there are no more mouse
// buttons depressed
if (MouseEvent::WebInputEventModifiersToButtons(mouse_event.GetModifiers()) ==
0)
ReleaseMouseCaptureFromLocalRoot();
return event_result;
}
......
third_party/blink/renderer/core/input/pointer_event_manager.cc
View file @ b79ea4e4
......@@ -877,6 +877,9 @@ bool PointerEventManager::GetPointerCaptureState(
PointerId pointer_id,
Element** pointer_capture_target,
Element** pending_pointer_capture_target) {
DCHECK(pointer_capture_target);
DCHECK(pending_pointer_capture_target);
PointerCapturingMap::const_iterator it;
it = pointer_capture_target_.find(pointer_id);
......@@ -886,10 +889,8 @@ bool PointerEventManager::GetPointerCaptureState(
Element* pending_pointercapture_target_temp =
(it != pending_pointer_capture_target_.end()) ? it->value : nullptr;
if (pointer_capture_target)
*pointer_capture_target = pointer_capture_target_temp;
if (pending_pointer_capture_target)
*pending_pointer_capture_target = pending_pointercapture_target_temp;
*pointer_capture_target = pointer_capture_target_temp;
*pending_pointer_capture_target = pending_pointercapture_target_temp;
return pointer_capture_target_temp != pending_pointercapture_target_temp;
}
......@@ -917,8 +918,9 @@ Element* PointerEventManager::ProcessCaptureAndPositionOfPointerEvent(
void PointerEventManager::ProcessPendingPointerCapture(
PointerEvent* pointer_event) {
Element* pointer_capture_target;
Element* pending_pointer_capture_target;
Element* pointer_capture_target = nullptr;
Element* pending_pointer_capture_target = nullptr;
const PointerId pointer_id = pointer_event->pointerId();
const bool is_capture_changed = GetPointerCaptureState(
pointer_id, &pointer_capture_target, &pending_pointer_capture_target);
......
third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html 0 → 100644
View file @ b79ea4e4
<!doctype html>
<html>
<head>
<title>Set/Release capture when using chorded buttons</title>
<meta name="viewport" content="width=device-width">
<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1053385">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-actions.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<style>
.container {
height: 500px;
width: 500px;
border: 1px solid black;
overflow: hidden;
position: relative;
}
#box {
height: 50px;
width: 50px;
background: red;
position: absolute;
}
</style>
</head>
<body>
<h1>Pointer Events Capture Test - capture should not be lost early</h1>
<h4>
Test Description: This test checks if setCapture/pointerup functions
works properly. Complete the following actions:
<ol>
<li> Put your mouse over the red box
<li> Press and hold left mouse button. Box will call setPointerCapture
<li> Press right button and release
<li> Pointer capture should not be lost
<li> Press right button again and release
<li> Pointer capture should not be lost
<li> Release left mouse button. lostpointercapture is called
</ol>
</h4>
Test passes if the proper behavior of the events is observed.
<div class="container">
<div id="box"></div>
</div>
<div id="log"></div>
</body>
<script>
var PhaseEnum = {
WaitingForDown: "down",
WaitingForUp: "up",
UpDone : "up_done"
};
var origin = {x:0, y:0};
var position = {x:0, y:0};
var deltaX = 0;
var deltaY = 0;
var box = document.getElementById("box");
var logDiv = document.getElementById("log");
var currentPhase = PhaseEnum.WaitingForDown;
var events = [];
function slide(event){
// move the target following the mouse
deltaX = event.clientX - origin.x
deltaY = event.clientY - origin.y
box.style.left = `${position.x + deltaX}px`;
box.style.top = `${position.y + deltaY}px`;
}
function addLog(message){
var messageDiv = document.createElement("div");
var textContent = document.createTextNode(message);
messageDiv.appendChild(textContent);
logDiv.appendChild(messageDiv);
}
function handle_pointerdown(e){
box.setPointerCapture(e.pointerId);
if(window.promise_test){
current_test.step(function(){
// once receiving a pointer down and the pointer is captured,
// no other mousedown should send pointerdown events during the test
assert_true(currentPhase === PhaseEnum.WaitingForDown,
"Current Phase should be " + PhaseEnum.WaitingForDown);
currentPhase = PhaseEnum.WaitingForUp;
events.push("target@pointerdown");
});
}
origin = { x: event.clientX, y: event.clientY };
box.addEventListener("pointermove", slide);
}
function handle_pointerup(e){
box.releasePointerCapture(e.pointerId);
if(window.promise_test){
current_test.step(function(){
assert_true(event.buttons === 0,
'pointerup should happen when all buttons are released.');
assert_true(currentPhase === PhaseEnum.WaitingForUp,
"Current Phase should be " + PhaseEnum.WaitingForUp);
currentPhase = PhaseEnum.UpDone;
events.push("target@pointerup");
});
}
box.removeEventListener("pointermove", slide);
}
function handle_contextmenu(e){
e.preventDefault();
}
function handle_lostpointercapture(e){
if(window.promise_test){
current_test.step(function(){
events.push("target@lostpointercapture");
assert_true(currentPhase === PhaseEnum.UpDone,
"Current Phase should be " + PhaseEnum.UpDone + "." +
'lostpointercapture should happen after pointerup event.');
assert_true(event.buttons === 0,
'lostpointercapture should happen when all buttons are released.');
assert_array_equals(events, ["target@pointerdown",
"target@pointerup", "target@lostpointercapture"]);
resolve_test();
current_test.done();
});
}
if(event.buttons === 0){
addLog("Test Passed!");
}else{
addLog("Test Failed!");
}
}
function removeEventListeners(){
box.removeEventListener('pointerdown', handle_pointerdown);
box.removeEventListener('pointerup', handle_pointerup);
box.removeEventListener('contextmenu', handle_contextmenu);
box.removeEventListener('lostpointercapture',
handle_lostpointercapture);
}
function addEventListeners(){
box.addEventListener('pointerdown', handle_pointerdown);
box.addEventListener('pointerup', handle_pointerup);
box.addEventListener('contextmenu', handle_contextmenu);
box.addEventListener('lostpointercapture',
handle_lostpointercapture);
}
var current_test = null;
var resolve_test = null;
var reject_test = null;
// window.promise_test is only defined when running the
// test using testharness.js
// if window.promise_test is not defined we'll run the manual testing
// path
if(!window.promise_test){
addEventListeners();
}
if(window.promise_test){
promise_test(function(t){
addEventListeners();
t.add_cleanup(function(){
removeEventListeners();
currentPhase = PhaseEnum.WaitingForDown;
events = [];
});
return new Promise(function(resolve, reject){
current_test = t;
resolve_test = resolve;
reject_test = reject;
var actions = new test_driver.Actions();
var actions_promise = actions
.pointerMove(0, 0, {origin: box})
.pointerDown({button: actions.ButtonType.LEFT})
// Ensure clicking other buttons while a first button has
// captured the pointer doesn't release the capture
.pointerDown({button: actions.ButtonType.RIGHT})
.pointerUp({button: actions.ButtonType.RIGHT})
.pointerDown({button: actions.ButtonType.RIGHT})
.pointerUp({button: actions.ButtonType.RIGHT})
.pointerUp({button: actions.ButtonType.LEFT})
.send();
})
}, "Pointer Events Capture Test - capture not lost due to " +
"chorded buttons interaction");
promise_test(function(t){
addEventListeners();
t.add_cleanup(function(){
removeEventListeners();
currentPhase = PhaseEnum.WaitingForDown;
events = [];
});
return new Promise(function(resolve, reject){
current_test = t;
resolve_test = resolve;
reject_test = reject;
var actions = new test_driver.Actions();
var actions_promise = actions
.pointerMove(0, 0, {origin: box})
.pointerDown({button: actions.ButtonType.LEFT})
// Ensure clicking other buttons while a first button has
// captured the pointer doesn't release the capture
.pointerDown({button: actions.ButtonType.RIGHT})
.pointerUp({button: actions.ButtonType.LEFT})
.pointerDown({button: actions.ButtonType.LEFT})
.pointerUp({button: actions.ButtonType.RIGHT})
.pointerUp({button: actions.ButtonType.LEFT})
.send();
})
}, "Pointer Events Capture Test - capture not lost " +
"due to combination of left and right chorded buttons interaction.");
}
</script>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment