Changeset 180699 in webkit

Timestamp:

Feb 26, 2015, 2:21:18 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r179904. rdar://problem/19966381

Location:

branches/safari-600.1.4.15-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/ViewGestureControllerIOS.mm (modified) (1 diff)

branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-26  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r179904
+
+    2015-02-10  Dan Bernstein  <mitz@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  <lforschler@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm

@@ -248 +248 @@
 
     [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]);