Title: [210641] branches/safari-603-branch/Source/WebKit2
- Revision
- 210641
- Author
- matthew_han...@apple.com
- Date
- 2017-01-12 08:45:10 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210281. rdar://problem/29849769
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210640 => 210641)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-12 16:45:07 UTC (rev 210640)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-12 16:45:10 UTC (rev 210641)
@@ -1,3 +1,23 @@
+2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r210281. rdar://problem/29849769
+
+ 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-06 Matthew Hanson <matthew_han...@apple.com>
Merge r210221. rdar://problem/29449474
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (210640 => 210641)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-12 16:45:07 UTC (rev 210640)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-12 16:45:10 UTC (rev 210641)
@@ -5443,6 +5443,10 @@
m_activePopupMenu = nullptr;
m_mediaState = MediaProducer::IsNotPlaying;
+
+#if ENABLE(POINTER_LOCK)
+ requestPointerUnlock();
+#endif
}
void WebPageProxy::resetStateAfterProcessExited()
@@ -5490,10 +5494,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
