[Feature] Add LeafDisplayList (#270)

Kyle-Ye · web-flow · commit ef893ddf5886 · 2025-05-09T02:14:52.000+08:00
* Update LeafDisplayList

* Update DisplayList print
diff --git a/Example/HostingExample/ViewController.swift b/Example/HostingExample/ViewController.swift
@@ -66,6 +66,6 @@ class ViewController: NSViewController {
 
 struct ContentView: View {
     var body: some View {
-        AppearanceActionModifierExample()
+        Color(uiColor: .red)
     }
 }
diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift
@@ -509,10 +509,66 @@ extension _UIHostingView: ViewRendererHost {
     package func updateScrollableContainerSize() {
         // preconditionFailure("TODO")
     }
-    
-    package func renderDisplayList(_ list: DisplayList, asynchronously: Bool, time: Time, nextTime: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time {
-        // preconditionFailure("TODO")
-        return .infinity
+
+    var shouldDisableUIKitAnimations: Bool {
+        // FIXME
+        false
+    }
+
+    package func renderDisplayList(
+        _ list: DisplayList,
+        asynchronously: Bool,
+        time: Time,
+        nextTime: Time,
+        targetTimestamp: Time?,
+        version: DisplayList.Version,
+        maxVersion: DisplayList.Version
+    ) -> Time {
+        func render() -> Time {
+            let scale = window?.screen.scale ?? 1
+            let environment = DisplayList.ViewRenderer.Environment(contentScale: scale)
+            return renderer.render(
+                rootView: self,
+                from: list,
+                time: time,
+                nextTime: nextTime,
+                version: version,
+                maxVersion: maxVersion,
+                environment: environment
+            )
+        }
+
+        if asynchronously {
+            if let renderedTime = renderer.renderAsync(
+                to: list,
+                time: time,
+                nextTime: nextTime,
+                targetTimestamp: targetTimestamp,
+                version: version,
+                maxVersion: maxVersion
+            ) {
+                return renderedTime
+            } else {
+                var renderedTime = nextTime
+                Update.syncMain {
+                    renderedTime = render()
+                }
+                return renderedTime
+            }
+        } else {
+            if Self.areAnimationsEnabled, shouldDisableUIKitAnimations {
+                var renderedTime = nextTime // FIXME
+                Self.performWithoutAnimation {
+                    renderedTime = render()
+                }
+                allowUIKitAnimationsForNextUpdate = false
+                return renderedTime
+            } else {
+                let renderedTime = render()
+                allowUIKitAnimationsForNextUpdate = false
+                return renderedTime
+            }
+        }
     }
     
     package func updateRootView() {
diff --git a/Sources/OpenSwiftUICore/Graphic/BackdropEffect.swift b/Sources/OpenSwiftUICore/Graphic/BackdropEffect.swift
@@ -0,0 +1,20 @@
+//
+//  BackdropEffect.swift
+//  OpenSwiftUICore
+//
+//  Audited for iOS 18.0
+//  Status: WIP
+
+package struct BackdropEffect {
+    package var scale: Float
+
+    package var color: Color.Resolved
+
+    package var filters: [GraphicsFilter]
+
+    package init(scale: Float = 1, color: Color.Resolved = .black, filters: [GraphicsFilter] = [], captureOnly: Bool = false) {
+        self.scale = scale
+        self.color = color
+        self.filters = filters
+    }
+}
diff --git a/Sources/OpenSwiftUICore/Graphic/Color/ColorView.swift b/Sources/OpenSwiftUICore/Graphic/Color/ColorView.swift
@@ -31,7 +31,7 @@ package struct ColorView: RendererLeafView, Animatable {
     }
     
     package func content() -> DisplayList.Content.Value {
-        preconditionFailure("TODO")
+        .color(color)
     }
         
     package var animatableData: Color.Resolved.AnimatableData {
diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift
@@ -4,7 +4,7 @@
 //
 //  Audited for iOS 18.0
 //  Status: WIP
-//  ID: F37E3733E490AA5E3BDC045E3D34D9F8
+//  ID: F37E3733E490AA5E3BDC045E3D34D9F8 (SwiftUICore)
 
 package import Foundation
 
@@ -105,22 +105,31 @@ extension DisplayList.Version: Sendable {}
 
 extension DisplayList {
     package typealias Identity = _DisplayList_Identity
+
     package typealias StableIdentity = _DisplayList_StableIdentity
+
     package typealias StableIdentityMap = _DisplayList_StableIdentityMap
+
     package typealias StableIdentityRoot = _DisplayList_StableIdentityRoot
+
     package typealias StableIdentityScope = _DisplayList_StableIdentityScope
-    
+
     package struct Item: Equatable {
         package var frame: CGRect
+
         package var version: Version
+
         package var value: Item.Value
+
         package var identity: Identity
+
         package enum Value {
             case empty
             case content(Content)
             case effect(Effect, DisplayList)
             case states([(StrongHash, DisplayList)])
         }
+
         package init(_ value: Item.Value, frame: CGRect, identity: Identity, version: Version) {
             self.frame = frame
             self.version = version
@@ -133,16 +142,19 @@ extension DisplayList {
         }
         
         package var position: CGPoint { frame.origin }
+
         package var size: CGSize { frame.size }
     }
     
     package struct Content {
         package var value: Content.Value
+
         package var seed: Seed
+
         package enum Value {
-//        indirect case backdrop(BackdropEffect)
+            indirect case backdrop(BackdropEffect)
             indirect case color(Color.Resolved)
-//        indirect case chameleonColor(fallback: Color.Resolved, filters: [GraphicsFilter])
+            indirect case chameleonColor(fallback: Color.Resolved, filters: [GraphicsFilter])
 //        indirect case image(GraphicsImage)
 //        indirect case shape(Path, AnyResolvedPaint, FillStyle)
 //        indirect case shadow(Path, ResolvedShadowStyle)
@@ -246,8 +258,14 @@ extension DisplayList {
             self.value = value
         }
         
-        package init() { self.init(value: .zero) }
-        package init(decodedValue value: UInt16) { self.init(value: value) }
+        package init() {
+            self.init(value: .zero)
+        }
+
+        package init(decodedValue value: UInt16) {
+            self.init(value: value)
+        }
+
         package init(_ version: Version) {
             if version.value == .zero {
                 self.init(value: .zero)
@@ -267,6 +285,7 @@ extension DisplayList {
         
         package static let undefined: Seed = Seed(value: 2)
     }
+    
     package struct Properties: OptionSet {
         package let rawValue: UInt8
         package init(rawValue: UInt8) {
@@ -404,3 +423,18 @@ extension DisplayList {
         }
     }
 }
+
+// MARK: - DisplayList.Item + Extension
+
+extension DisplayList.Item {
+    package mutating func canonicalize(options: DisplayList.Options = .init()) {
+        // TODO
+    }
+
+    // package func matchesTopLevelStructure(of other: DisplayList.Item) -> Bool
+
+    package var features: DisplayList.Features {
+        // TODO
+        []
+    }
+}
diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListPrinter.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListPrinter.swift
@@ -1,14 +1,14 @@
 //
-//  DisplayList+String.swift
+//  DisplayListPrinter.swift
 //  OpenSwiftUICore
 //
 //  Audited for iOS 18.0
 //  Status: WIP
-//  ID: 11125C146A81D1913BFBD53B89D010C6
+//  ID: 11125C146A81D1913BFBD53B89D010C6 (SwiftUICore)
 
 extension DisplayList.Item {
     // TODO
-    var features: DisplayList.Features { [] }
+    // var features: DisplayList.Features { [] }
     var properties: DisplayList.Properties { [] }
     
     fileprivate func print(into printer: inout SExpPrinter) {
diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift
@@ -0,0 +1,19 @@
+//
+//  DisplayListTransforms.swift
+//  OpenSwiftUICore
+//
+//  Audited for iOS 18.0
+//  Status: WIP
+//  ID: 8C82E31DBCFF23E23B8937F47207F4D1 (SwiftUICore)
+
+package import OpenGraphShims
+
+extension DisplayList {
+//    package mutating func insertLayerFilters(matrices: [_ForegroundLayerLevel : _ColorMatrix], version: DisplayList.Version, premultiplied: Bool) {
+//
+//    }
+
+    package mutating func applyViewGraphTransform(time: Attribute<Time>, version: DisplayList.Version) {
+        // TODO
+    }
+}
diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListViewRenderer.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListViewRenderer.swift
@@ -4,7 +4,7 @@
 //
 //  Audited for iOS 18.0
 //  Status: Blocked by ViewUpdater and ViewRasterizer
-//  ID: 21FFA3C7D88AC65BB559906758271BFC
+//  ID: 21FFA3C7D88AC65BB559906758271BFC (SwiftUICore)
 
 package import Foundation
 
@@ -118,7 +118,13 @@ extension DisplayList {
             renderer?.viewCacheIsEmpty ?? true
         }
     }
-    
+}
+
+// MARK: - DisplayList.ViewRasterizer
+
+private var printTree: Bool?
+
+extension DisplayList {
     private final class ViewRasterizer: ViewRendererBase {
         let platform: DisplayList.ViewUpdater.Platform
         weak var host: ViewRendererHost?
@@ -127,27 +133,34 @@ extension DisplayList {
         let renderer: DisplayList.GraphicsRenderer
         var seed: DisplayList.Seed
         var lastContentsScale: CGFloat
-        
+
         init(platform: DisplayList.ViewUpdater.Platform, host: ViewRendererHost?, rootView: AnyObject, options: _RendererConfiguration.RasterizationOptions) {
             preconditionFailure("")
         }
-        
+
         var exportedObject: AnyObject? {
             platform.definition.getRBLayer(drawingView: drawingView!)
         }
-        
+
         func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time {
-            preconditionFailure("TODO")
+            // preconditionFailure("TODO")
+            if printTree == nil {
+                printTree = ProcessEnvironment.bool(forKey: "OPENSWIFTUI_PRINT_TREE")
+            }
+            if let printTree, printTree {
+                print("View \(Unmanaged.passUnretained(rootView).toOpaque()) at \(time):\n\(list.description)")
+            }
+            return .zero
         }
-        
+
         func renderAsync(to list: DisplayList, time: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time? {
             preconditionFailure("TODO")
         }
-        
+
         func destroy(rootView: AnyObject) {
             preconditionFailure("TODO")
         }
-        
+
         var viewCacheIsEmpty: Bool {
             preconditionFailure("TODO")
         }
diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListViewUpdater.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayListViewUpdater.swift
@@ -4,12 +4,18 @@
 //
 //  Audited for iOS 18.0
 //  Status: WIP
+//  ID: B86250B2E056EB47628ECF46032DFA4C (SwiftUICore)
+
+private var printTree: Bool?
 
 extension DisplayList {
     // FIXME
     final package class ViewUpdater: ViewRendererBase {
         init() {
-            preconditionFailure("")
+            // preconditionFailure("TODO")
+            platform = .init(rawValue: 0)
+            exportedObject = nil
+            viewCacheIsEmpty = false
         }
         
         init(platform: Platform, exportedObject: AnyObject? = nil, viewCacheIsEmpty: Bool) {
@@ -23,7 +29,14 @@ extension DisplayList {
         var exportedObject: AnyObject?
         
         func render(rootView: AnyObject, from list: DisplayList, time: Time, version: DisplayList.Version, maxVersion: DisplayList.Version, environment: DisplayList.ViewRenderer.Environment) -> Time {
-            .zero
+            // TODO
+            if printTree == nil {
+                printTree = ProcessEnvironment.bool(forKey: "OPENSWIFTUI_PRINT_TREE")
+            }
+            if let printTree, printTree {
+                print("View \(Unmanaged.passUnretained(rootView).toOpaque()) at \(time):\n\(list.description)")
+            }
+            return .zero
         }
         
         func renderAsync(to list: DisplayList, time: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time? {
diff --git a/Sources/OpenSwiftUICore/Render/RendererLeafView.swift b/Sources/OpenSwiftUICore/Render/RendererLeafView.swift
diff --git a/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift b/Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ class ViewController: NSViewController {`
`66`	`66`
`67`	`67`	`struct ContentView: View {`
`68`	`68`	`var body: some View {`
`69`		`- AppearanceActionModifierExample()`
	`69`	`+ Color(uiColor: .red)`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ package struct ColorView: RendererLeafView, Animatable {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`package func content() -> DisplayList.Content.Value {`
`34`		`- preconditionFailure("TODO")`
	`34`	`+ .color(color)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`package var animatableData: Color.Resolved.AnimatableData {`