Title: [212051] branches/safari-603-branch/Source/WebKit2
- Revision
- 212051
- Author
- matthew_han...@apple.com
- Date
- 2017-02-09 22:36:13 -0800 (Thu, 09 Feb 2017)
Log Message
Merge r211652. rdar://problem/30040618
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212050 => 212051)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-10 06:36:11 UTC (rev 212050)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-10 06:36:13 UTC (rev 212051)
@@ -1,5 +1,23 @@
2017-02-09 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211652. rdar://problem/30040618
+
+ 2017-02-03 Jeremy Jones <jere...@apple.com>
+
+ Require keyboard focus for pointer lock.
+ https://bugs.webkit.org/show_bug.cgi?id=167750
+
+ Reviewed by Tim Horton.
+
+ When keyboard focus leaves the page, end pointer lock
+ Prevent pointer lock when the page doesn't have keyboard focus.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::dispatchActivityStateChange):
+ (WebKit::WebPageProxy::requestPointerLock):
+
+2017-02-09 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211622. rdar://problem/30116072
2017-02-02 Andreas Kling <akl...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (212050 => 212051)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-10 06:36:11 UTC (rev 212050)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-10 06:36:13 UTC (rev 212051)
@@ -1566,7 +1566,8 @@
m_process->responsivenessTimer().stop();
#if ENABLE(POINTER_LOCK)
- if (((changed & ActivityState::IsVisible) && !isViewVisible()) || ((changed & ActivityState::WindowIsActive) && !m_pageClient.isViewWindowActive()))
+ if (((changed & ActivityState::IsVisible) && !isViewVisible()) || ((changed & ActivityState::WindowIsActive) && !m_pageClient.isViewWindowActive())
+ || ((changed & ActivityState::IsFocused) && !(m_activityState & ActivityState::IsFocused)))
requestPointerUnlock();
#endif
@@ -6766,7 +6767,8 @@
ASSERT(!m_isPointerLockPending);
ASSERT(!m_isPointerLocked);
m_isPointerLockPending = true;
- if (!isViewVisible()) {
+
+ if (!isViewVisible() || !(m_activityState & ActivityState::IsFocused)) {
didDenyPointerLock();
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
