Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/Display/Source/ContainableController.swift

@@ -0,0 +1,30 @@
+import UIKit
+import AsyncDisplayKit
+import SwiftSignalKit
+
+public protocol PresentableController: AnyObject {
+    func viewDidAppear(completion: @escaping () -> Void)
+}
+
+public protocol ContainableController: AnyObject {
+    var view: UIView! { get }
+    var displayNode: ASDisplayNode { get }
+    var isViewLoaded: Bool { get }
+    var isOpaqueWhenInOverlay: Bool { get }
+    var blocksBackgroundWhenInOverlay: Bool { get }
+    var ready: Promise<Bool> { get }
+    var updateTransitionWhenPresentedAsModal: ((CGFloat, ContainedViewLayoutTransition) -> Void)? { get set }
+    
+    func combinedSupportedOrientations(currentOrientationToLock: UIInterfaceOrientationMask) -> ViewControllerSupportedOrientations
+    var deferScreenEdgeGestures: UIRectEdge { get }
+    var prefersOnScreenNavigationHidden: Bool { get }
+    
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition)
+    func updateToInterfaceOrientation(_ orientation: UIInterfaceOrientation)
+    func preferredContentSizeForLayout(_ layout: ContainerViewLayout) -> CGSize?
+    
+    func viewWillAppear(_ animated: Bool)
+    func viewWillDisappear(_ animated: Bool)
+    func viewDidAppear(_ animated: Bool)
+    func viewDidDisappear(_ animated: Bool)
+}