Title: [210281] trunk/Source/WebKit2
- Revision
- 210281
- Author
- commit-qu...@webkit.org
- Date
- 2017-01-04 11:23:48 -0800 (Wed, 04 Jan 2017)
Log Message
Release pointer lock when page state is reset for any reason, not just for process exited.
https://bugs.webkit.org/show_bug.cgi?id=166654
<rdar://problem/29849769>
Patch by Jeremy Jones <jere...@apple.com> on 2017-01-04
Reviewed by Tim Horton.
Pointer lock was not being released when the window is closed.
Move the pointer lock to resetState() so it happens whenever the page is
reset, not just when it is reset after process exit.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resetState): Release here.
(WebKit::WebPageProxy::resetStateAfterProcessExited): Don't release here.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (210280 => 210281)
--- trunk/Source/WebKit2/ChangeLog 2017-01-04 19:21:42 UTC (rev 210280)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-04 19:23:48 UTC (rev 210281)
@@ -1,3 +1,19 @@
+2017-01-04 Jeremy Jones <jere...@apple.com>
+
+ Release pointer lock when page state is reset for any reason, not just for process exited.
+ https://bugs.webkit.org/show_bug.cgi?id=166654
+ <rdar://problem/29849769>
+
+ Reviewed by Tim Horton.
+
+ Pointer lock was not being released when the window is closed.
+ Move the pointer lock to resetState() so it happens whenever the page is
+ reset, not just when it is reset after process exit.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetState): Release here.
+ (WebKit::WebPageProxy::resetStateAfterProcessExited): Don't release here.
+
2017-01-03 Tim Horton <timothy_hor...@apple.com>
NSSpellChecker's recordResponse isn't called for unseen automatic corrections
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (210280 => 210281)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-04 19:21:42 UTC (rev 210280)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-04 19:23:48 UTC (rev 210281)
@@ -5448,6 +5448,10 @@
m_activePopupMenu = nullptr;
m_mediaState = MediaProducer::IsNotPlaying;
+
+#if ENABLE(POINTER_LOCK)
+ requestPointerUnlock();
+#endif
}
void WebPageProxy::resetStateAfterProcessExited()
@@ -5495,10 +5499,6 @@
m_pageClient.dismissContentRelativeChildWindows();
#endif
-#if ENABLE(POINTER_LOCK)
- requestPointerUnlock();
-#endif
-
PageLoadState::Transaction transaction = m_pageLoadState.transaction();
m_pageLoadState.reset(transaction);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
