Title: [180699] branches/safari-600.1.4.15-branch/Source/WebKit2
- Revision
- 180699
- Author
- lforsch...@apple.com
- Date
- 2015-02-26 14:21:18 -0800 (Thu, 26 Feb 2015)
Log Message
Merged r179904. rdar://problem/19966381
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (180698 => 180699)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-26 22:18:10 UTC (rev 180698)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-26 22:21:18 UTC (rev 180699)
@@ -1,5 +1,20 @@
2015-02-26 Lucas Forschler <lforsch...@apple.com>
+ Merge r179904
+
+ 2015-02-10 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/19770264> Starting a navigation gesture dismisses the keyboard
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture): Reordered the view hierarchy changes,
+ such that m_liveSwipeView will not momentarily move out of the window, because that causes
+ the window’s first responder to be set to nil (if it was a descendant of m_liveSwipView).
+
+2015-02-26 Lucas Forschler <lforsch...@apple.com>
+
Merge r179480
2015-02-02 Jeremy Jones <jere...@apple.com>
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (180698 => 180699)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-02-26 22:18:10 UTC (rev 180698)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-02-26 22:21:18 UTC (rev 180699)
@@ -247,8 +247,8 @@
[m_liveSwipeViewClippingView setClipsToBounds:YES];
[m_liveSwipeView.superview insertSubview:m_transitionContainerView.get() belowSubview:m_liveSwipeView];
+ [m_transitionContainerView addSubview:m_liveSwipeViewClippingView.get()];
[m_liveSwipeViewClippingView addSubview:m_liveSwipeView];
- [m_transitionContainerView addSubview:m_liveSwipeViewClippingView.get()];
RetainPtr<UIViewController> targettedViewController = adoptNS([[UIViewController alloc] init]);
[targettedViewController setView:m_liveSwipeViewClippingView.get()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
