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

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, 6 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 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 1208
1209 void EventHandler::ReleasePointerCapture(int pointer_id, EventTarget* target) { 1209 void EventHandler::ReleasePointerCapture(int pointer_id, EventTarget* target) {
1210 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) { 1210 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) {
1211 frame_->LocalFrameRoot().GetEventHandler().ReleasePointerCapture(pointer_id, 1211 frame_->LocalFrameRoot().GetEventHandler().ReleasePointerCapture(pointer_id,
1212 target); 1212 target);
1213 } else { 1213 } else {
1214 pointer_event_manager_->ReleasePointerCapture(pointer_id, target); 1214 pointer_event_manager_->ReleasePointerCapture(pointer_id, target);
1215 } 1215 }
1216 } 1216 }
1217 1217
1218 void EventHandler::ReleaseMousePointerCapture() {
1219 pointer_event_manager_->ReleaseMousePointerCapture();
1220 }
1221
1218 bool EventHandler::HasPointerCapture(int pointer_id, 1222 bool EventHandler::HasPointerCapture(int pointer_id,
1219 const EventTarget* target) const { 1223 const EventTarget* target) const {
1220 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) { 1224 if (RootFrameTouchPointerActiveInCurrentFrame(pointer_id)) {
1221 return frame_->LocalFrameRoot().GetEventHandler().HasPointerCapture( 1225 return frame_->LocalFrameRoot().GetEventHandler().HasPointerCapture(
1222 pointer_id, target); 1226 pointer_id, target);
1223 } else { 1227 } else {
1224 return pointer_event_manager_->HasPointerCapture(pointer_id, target); 1228 return pointer_event_manager_->HasPointerCapture(pointer_id, target);
1225 } 1229 }
1226 } 1230 }
1227 1231
1228 bool EventHandler::HasProcessedPointerCapture(int pointer_id, 1232 bool EventHandler::HasProcessedPointerCapture(int pointer_id,
1229 const EventTarget* target) const { 1233 const EventTarget* target) const {
1230 return pointer_event_manager_->HasProcessedPointerCapture(pointer_id, target); 1234 return pointer_event_manager_->HasProcessedPointerCapture(pointer_id, target);
1231 } 1235 }
1232 1236
1237 void EventHandler::ProcessPendingPointerCaptureForPointerLock(
1238 const WebMouseEvent& mouse_event) {
1239 pointer_event_manager_->ProcessPendingPointerCaptureForPointerLock(
1240 mouse_event);
1241 }
1242
1233 void EventHandler::ElementRemoved(EventTarget* target) { 1243 void EventHandler::ElementRemoved(EventTarget* target) {
1234 pointer_event_manager_->ElementRemoved(target); 1244 pointer_event_manager_->ElementRemoved(target);
1235 } 1245 }
1236 1246
1237 WebInputEventResult EventHandler::UpdatePointerTargetAndDispatchEvents( 1247 WebInputEventResult EventHandler::UpdatePointerTargetAndDispatchEvents(
1238 const AtomicString& mouse_event_type, 1248 const AtomicString& mouse_event_type,
1239 Node* target_node, 1249 Node* target_node,
1240 const String& canvas_region_id, 1250 const String& canvas_region_id,
1241 const WebMouseEvent& mouse_event, 1251 const WebMouseEvent& mouse_event,
1242 const Vector<WebMouseEvent>& coalesced_events) { 1252 const Vector<WebMouseEvent>& coalesced_events) {
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 MouseEventWithHitTestResults& mev, 2136 MouseEventWithHitTestResults& mev,
2127 LocalFrame* subframe) { 2137 LocalFrame* subframe) {
2128 WebInputEventResult result = 2138 WebInputEventResult result =
2129 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); 2139 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event());
2130 if (result != WebInputEventResult::kNotHandled) 2140 if (result != WebInputEventResult::kNotHandled)
2131 return result; 2141 return result;
2132 return WebInputEventResult::kHandledSystem; 2142 return WebInputEventResult::kHandledSystem;
2133 } 2143 }
2134 2144
2135 } // namespace blink 2145 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.h ('k') | third_party/WebKit/Source/core/input/PointerEventManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698