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

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

Issue 2807433003: No pointer captured when the pointer lock is applied (Closed)
Patch Set: pointer lock Created 3 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 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 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 1206
1207 void EventHandler::ReleasePointerCapture(int pointer_id, EventTarget* target) { 1207 void EventHandler::ReleasePointerCapture(int pointer_id, EventTarget* target) {
1208 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) { 1208 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) {
1209 frame_->LocalFrameRoot().GetEventHandler().ReleasePointerCapture(pointer_id, 1209 frame_->LocalFrameRoot().GetEventHandler().ReleasePointerCapture(pointer_id,
1210 target); 1210 target);
1211 } else { 1211 } else {
1212 pointer_event_manager_->ReleasePointerCapture(pointer_id, target); 1212 pointer_event_manager_->ReleasePointerCapture(pointer_id, target);
1213 } 1213 }
1214 } 1214 }
1215 1215
1216 void EventHandler::ReleaseMousePointerCapture() {
1217 pointer_event_manager_->ReleaseMousePointerCapture();
1218 }
1219
1216 bool EventHandler::HasPointerCapture(int pointer_id, 1220 bool EventHandler::HasPointerCapture(int pointer_id,
1217 const EventTarget* target) const { 1221 const EventTarget* target) const {
1218 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) { 1222 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) {
1219 return frame_->LocalFrameRoot().GetEventHandler().HasPointerCapture( 1223 return frame_->LocalFrameRoot().GetEventHandler().HasPointerCapture(
1220 pointer_id, target); 1224 pointer_id, target);
1221 } else { 1225 } else {
1222 return pointer_event_manager_->HasPointerCapture(pointer_id, target); 1226 return pointer_event_manager_->HasPointerCapture(pointer_id, target);
1223 } 1227 }
1224 } 1228 }
1225 1229
1226 bool EventHandler::HasProcessedPointerCapture(int pointer_id, 1230 bool EventHandler::HasProcessedPointerCapture(int pointer_id,
1227 const EventTarget* target) const { 1231 const EventTarget* target) const {
1228 return pointer_event_manager_->HasProcessedPointerCapture(pointer_id, target); 1232 return pointer_event_manager_->HasProcessedPointerCapture(pointer_id, target);
1229 } 1233 }
1230 1234
1235 void EventHandler::ProcessPendingPointerCapture(
1236 const WebMouseEvent& mouse_event,
1237 const Vector<WebMouseEvent>& coalesced_events) {
1238 pointer_event_manager_->ProcessPendingPointerCapture(mouse_event,
1239 coalesced_events);
1240 }
1241
1231 void EventHandler::ElementRemoved(EventTarget* target) { 1242 void EventHandler::ElementRemoved(EventTarget* target) {
1232 pointer_event_manager_->ElementRemoved(target); 1243 pointer_event_manager_->ElementRemoved(target);
1233 } 1244 }
1234 1245
1235 WebInputEventResult EventHandler::UpdatePointerTargetAndDispatchEvents( 1246 WebInputEventResult EventHandler::UpdatePointerTargetAndDispatchEvents(
1236 const AtomicString& mouse_event_type, 1247 const AtomicString& mouse_event_type,
1237 Node* target_node, 1248 Node* target_node,
1238 const String& canvas_region_id, 1249 const String& canvas_region_id,
1239 const WebMouseEvent& mouse_event, 1250 const WebMouseEvent& mouse_event,
1240 const Vector<WebMouseEvent>& coalesced_events) { 1251 const Vector<WebMouseEvent>& coalesced_events) {
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
2117 MouseEventWithHitTestResults& mev, 2128 MouseEventWithHitTestResults& mev,
2118 LocalFrame* subframe) { 2129 LocalFrame* subframe) {
2119 WebInputEventResult result = 2130 WebInputEventResult result =
2120 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); 2131 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event());
2121 if (result != WebInputEventResult::kNotHandled) 2132 if (result != WebInputEventResult::kNotHandled)
2122 return result; 2133 return result;
2123 return WebInputEventResult::kHandledSystem; 2134 return WebInputEventResult::kHandledSystem;
2124 } 2135 }
2125 2136
2126 } // namespace blink 2137 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698