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

Side by Side Diff: Source/core/page/PointerLockController.cpp

Issue 437443005: Revert of Revert of Remove prefixed Pointer Lock API. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/events/EventTypeNames.in ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 PassOwnPtrWillBeRawPtr<PointerLockController> PointerLockController::create(Page * page) 44 PassOwnPtrWillBeRawPtr<PointerLockController> PointerLockController::create(Page * page)
45 { 45 {
46 return adoptPtrWillBeNoop(new PointerLockController(page)); 46 return adoptPtrWillBeNoop(new PointerLockController(page));
47 } 47 }
48 48
49 void PointerLockController::requestPointerLock(Element* target) 49 void PointerLockController::requestPointerLock(Element* target)
50 { 50 {
51 if (!target || !target->inDocument() || m_documentOfRemovedElementWhileWaiti ngForUnlock) { 51 if (!target || !target->inDocument() || m_documentOfRemovedElementWhileWaiti ngForUnlock) {
52 enqueueEvent(EventTypeNames::pointerlockerror, target); 52 enqueueEvent(EventTypeNames::pointerlockerror, target);
53 enqueueEvent(EventTypeNames::webkitpointerlockerror, target);
54 return; 53 return;
55 } 54 }
56 55
57 if (target->document().isSandboxed(SandboxPointerLock)) { 56 if (target->document().isSandboxed(SandboxPointerLock)) {
58 // FIXME: This message should be moved off the console once a solution t o https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 57 // FIXME: This message should be moved off the console once a solution t o https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
59 target->document().addConsoleMessage(SecurityMessageSource, ErrorMessage Level, "Blocked pointer lock on an element because the element's frame is sandbo xed and the 'allow-pointer-lock' permission is not set."); 58 target->document().addConsoleMessage(SecurityMessageSource, ErrorMessage Level, "Blocked pointer lock on an element because the element's frame is sandbo xed and the 'allow-pointer-lock' permission is not set.");
60 enqueueEvent(EventTypeNames::pointerlockerror, target); 59 enqueueEvent(EventTypeNames::pointerlockerror, target);
61 enqueueEvent(EventTypeNames::webkitpointerlockerror, target);
62 return; 60 return;
63 } 61 }
64 62
65 if (m_element) { 63 if (m_element) {
66 if (m_element->document() != target->document()) { 64 if (m_element->document() != target->document()) {
67 enqueueEvent(EventTypeNames::pointerlockerror, target); 65 enqueueEvent(EventTypeNames::pointerlockerror, target);
68 enqueueEvent(EventTypeNames::webkitpointerlockerror, target);
69 return; 66 return;
70 } 67 }
71 enqueueEvent(EventTypeNames::pointerlockchange, target); 68 enqueueEvent(EventTypeNames::pointerlockchange, target);
72 enqueueEvent(EventTypeNames::webkitpointerlockchange, target);
73 m_element = target; 69 m_element = target;
74 } else if (m_page->chrome().client().requestPointerLock()) { 70 } else if (m_page->chrome().client().requestPointerLock()) {
75 m_lockPending = true; 71 m_lockPending = true;
76 m_element = target; 72 m_element = target;
77 } else { 73 } else {
78 enqueueEvent(EventTypeNames::pointerlockerror, target); 74 enqueueEvent(EventTypeNames::pointerlockerror, target);
79 enqueueEvent(EventTypeNames::webkitpointerlockerror, target);
80 } 75 }
81 } 76 }
82 77
83 void PointerLockController::requestPointerUnlock() 78 void PointerLockController::requestPointerUnlock()
84 { 79 {
85 return m_page->chrome().client().requestPointerUnlock(); 80 return m_page->chrome().client().requestPointerUnlock();
86 } 81 }
87 82
88 void PointerLockController::elementRemoved(Element* element) 83 void PointerLockController::elementRemoved(Element* element)
89 { 84 {
(...skipping 20 matching lines...) Expand all
110 } 105 }
111 106
112 Element* PointerLockController::element() const 107 Element* PointerLockController::element() const
113 { 108 {
114 return m_element.get(); 109 return m_element.get();
115 } 110 }
116 111
117 void PointerLockController::didAcquirePointerLock() 112 void PointerLockController::didAcquirePointerLock()
118 { 113 {
119 enqueueEvent(EventTypeNames::pointerlockchange, m_element.get()); 114 enqueueEvent(EventTypeNames::pointerlockchange, m_element.get());
120 enqueueEvent(EventTypeNames::webkitpointerlockchange, m_element.get());
121 m_lockPending = false; 115 m_lockPending = false;
122 } 116 }
123 117
124 void PointerLockController::didNotAcquirePointerLock() 118 void PointerLockController::didNotAcquirePointerLock()
125 { 119 {
126 enqueueEvent(EventTypeNames::pointerlockerror, m_element.get()); 120 enqueueEvent(EventTypeNames::pointerlockerror, m_element.get());
127 enqueueEvent(EventTypeNames::webkitpointerlockerror, m_element.get());
128 clearElement(); 121 clearElement();
129 } 122 }
130 123
131 void PointerLockController::didLosePointerLock() 124 void PointerLockController::didLosePointerLock()
132 { 125 {
133 enqueueEvent(EventTypeNames::pointerlockchange, m_element ? &m_element->docu ment() : m_documentOfRemovedElementWhileWaitingForUnlock.get()); 126 enqueueEvent(EventTypeNames::pointerlockchange, m_element ? &m_element->docu ment() : m_documentOfRemovedElementWhileWaitingForUnlock.get());
134 enqueueEvent(EventTypeNames::webkitpointerlockchange, m_element ? &m_element ->document() : m_documentOfRemovedElementWhileWaitingForUnlock.get());
135 clearElement(); 127 clearElement();
136 m_documentOfRemovedElementWhileWaitingForUnlock = nullptr; 128 m_documentOfRemovedElementWhileWaitingForUnlock = nullptr;
137 } 129 }
138 130
139 void PointerLockController::dispatchLockedMouseEvent(const PlatformMouseEvent& e vent, const AtomicString& eventType) 131 void PointerLockController::dispatchLockedMouseEvent(const PlatformMouseEvent& e vent, const AtomicString& eventType)
140 { 132 {
141 if (!m_element || !m_element->document().frame()) 133 if (!m_element || !m_element->document().frame())
142 return; 134 return;
143 135
144 m_element->dispatchMouseEvent(event, eventType, event.clickCount()); 136 m_element->dispatchMouseEvent(event, eventType, event.clickCount());
(...skipping 22 matching lines...) Expand all
167 } 159 }
168 160
169 void PointerLockController::trace(Visitor* visitor) 161 void PointerLockController::trace(Visitor* visitor)
170 { 162 {
171 visitor->trace(m_page); 163 visitor->trace(m_page);
172 visitor->trace(m_element); 164 visitor->trace(m_element);
173 visitor->trace(m_documentOfRemovedElementWhileWaitingForUnlock); 165 visitor->trace(m_documentOfRemovedElementWhileWaitingForUnlock);
174 } 166 }
175 167
176 } // namespace blink 168 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/EventTypeNames.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698