Title: [211269] branches/safari-603-branch
- Revision
- 211269
- Author
- matthew_han...@apple.com
- Date
- 2017-01-27 00:02:17 -0800 (Fri, 27 Jan 2017)
Log Message
Merge r211234. rdar://problem/29899862
Modified Paths
Diff
Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211268 => 211269)
--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-27 08:02:14 UTC (rev 211268)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-27 08:02:17 UTC (rev 211269)
@@ -1,5 +1,20 @@
2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211234. rdar://problem/29899862
+
+ 2017-01-26 Jeremy Jones <jere...@apple.com>
+
+ Request pointer unlock on navigation and re-enable pointer-lock tests for WK2.
+ https://bugs.webkit.org/show_bug.cgi?id=166765
+
+ Reviewed by Tim Horton.
+
+ Enabled pointer lock tests for wk2 now that pointer lock state is being reset after each test.
+
+ * platform/mac-wk2/TestExpectations:
+
+2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211201. rdar://problem/30134866
2017-01-25 Ryosuke Niwa <rn...@webkit.org>
Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations (211268 => 211269)
--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations 2017-01-27 08:02:14 UTC (rev 211268)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations 2017-01-27 08:02:17 UTC (rev 211269)
@@ -613,3 +613,4 @@
webkit.org/b/166765 [ Debug ] http/tests/pointer-lock/iframe-sandboxed-nested-allow-pointer-lock.html [ Crash ]
webkit.org/b/166765 [ Debug ] http/tests/pointer-lock/pointerlockelement-same-origin.html [ Crash ]
webkit.org/b/166765 [ Debug ] pointer-lock/lock-lost-on-alert.html [ Crash ]
+
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211268 => 211269)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:14 UTC (rev 211268)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:17 UTC (rev 211269)
@@ -1,5 +1,22 @@
2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211234. rdar://problem/29899862
+
+ 2017-01-26 Jeremy Jones <jere...@apple.com>
+
+ Request pointer unlock on navigation and re-enable pointer-lock tests for WK2.
+ https://bugs.webkit.org/show_bug.cgi?id=166765
+
+ Reviewed by Tim Horton.
+
+ When the main frame is load is committed, pointer lock should end.
+ This resets pointer lock state between tests and allows tests to succeed.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+
+2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211229. rdar://problem/30216981
2017-01-26 Chris Dumez <cdu...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (211268 => 211269)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-27 08:02:14 UTC (rev 211268)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-27 08:02:17 UTC (rev 211269)
@@ -3350,6 +3350,11 @@
}
}
+#if ENABLE(POINTER_LOCK)
+ if (frame->isMainFrame())
+ requestPointerUnlock();
+#endif
+
m_pageLoadState.commitChanges();
if (m_navigationClient) {
if (frame->isMainFrame())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
