From 962d693f1a9e504448974130e340247da73379bf Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 11 Mar 2026 00:06:11 +0800 Subject: [PATCH] Update to use ORB instead of RB --- Package.resolved | 4 +-- .../AppKit/AppKitColorConversions.swift | 3 +- .../DisplayList/AppKitDisplayList.swift | 6 ++-- .../DisplayList/DisplayListViewDrawing.swift | 12 +++---- .../Render/DisplayList/RenderBoxView.swift | 24 ++++++------- .../Render/DisplayList/UIKitDisplayList.swift | 6 ++-- .../CAHostingLayerPlatformDefinition.swift | 10 +++--- .../DisplayList.GraphicsRenderer.swift | 2 +- .../Render/DisplayList/DisplayList.swift | 6 ++-- .../Render/PlatformDrawable.swift | 8 ++--- .../Render/RasterizationOptions.swift | 14 ++++---- .../Render/RendererConfiguration.swift | 2 +- Sources/OpenSwiftUICore/Shape/Path.swift | 34 +++++++++---------- Sources/OpenSwiftUICore/Shape/PathData.swift | 8 ++--- .../Shape/ShapeStyle/ShapeStyleResolver.swift | 2 +- .../OpenSwiftUICore/Util/RenderBoxShims.swift | 4 +-- .../View/Image/GraphicsImage.swift | 14 ++++---- .../View/Image/SymbolRenderingMode.swift | 4 +-- .../View/Image/VectorImageLayer.swift | 4 +-- .../View/Text/Text/Text+View.swift | 2 +- .../Overlay/CoreGraphics/CGPath+OpenSwiftUI.m | 6 ++-- Sources/OpenSwiftUI_SPI/Util/PathData.h | 4 +-- 22 files changed, 89 insertions(+), 90 deletions(-) diff --git a/Package.resolved b/Package.resolved index 801914170..1bb4b531d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -16,7 +16,7 @@ "location" : "https://github.com/OpenSwiftUIProject/OpenAttributeGraph", "state" : { "branch" : "main", - "revision" : "91dd6f1b3b3bcfc13872b0e7eb145302279ebf04" + "revision" : "30d5d34497452dc218f862ebd48b9bb0eae3fcc7" } }, { @@ -43,7 +43,7 @@ "location" : "https://github.com/OpenSwiftUIProject/OpenRenderBox", "state" : { "branch" : "main", - "revision" : "5ae2d6708298f64ca4fcbe5977fb7627ad243f65" + "revision" : "9a04f8654ce53414e70c7a755bd4d6890cecf9ec" } }, { diff --git a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift index 3673b0235..5c3879a62 100644 --- a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift +++ b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift @@ -2,6 +2,7 @@ // AppKitColorConversions.swift // OpenSwiftUI // +// Audited for 6.5.4 // Status: Complete // ID: 7137BB7EE57FAC34F81DC437C151F7AB (SwiftUI) @@ -11,7 +12,7 @@ public import OpenSwiftUICore public import AppKit import COpenSwiftUI -// MARK: - NSColor Conversions [6.5.4] +// MARK: - NSColor Conversions @available(iOS, unavailable) @available(macOS, introduced: 10.15, deprecated: 100000.0, message: "Use Color(nsColor:) when converting a NSColor, or create a standard Color directly") diff --git a/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift b/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift index 767b04ccc..9d10bd352 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift @@ -66,7 +66,7 @@ final class NSViewPlatformViewDefinition: PlatformViewDefinition, @unchecked Sen override static func makeDrawingView(options: PlatformDrawableOptions) -> any PlatformDrawable { let view: NSView & PlatformDrawable if options.isAccelerated && ORBDevice.isSupported() { - view = RBDrawingView(options: options) + view = ORBDrawingView(options: options) } else { view = CGDrawingView(options: options) } @@ -90,8 +90,8 @@ final class NSViewPlatformViewDefinition: PlatformViewDefinition, @unchecked Sen } override static func getRBLayer(drawingView: AnyObject) -> AnyObject? { - guard let rbView = drawingView as? RBDrawingView else { return nil } - return rbView.layer + guard let orbView = drawingView as? ORBDrawingView else { return nil } + return orbView.layer } override static func setIgnoresEvents(_ state: Bool, of view: AnyObject) { diff --git a/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift b/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift index 1c77dd546..60dd5193b 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift @@ -3,7 +3,7 @@ // OpenSwiftUI // // Audited for 6.5.4 -// Status: Blocked by RBDrawingView +// Status: Blocked by ORBDrawingView // ID: 65A81BD07F0108B0485D2E15DE104A75 (SwiftUI) #if canImport(Darwin) @@ -137,9 +137,9 @@ private final class CGDrawingLayer: CALayer { } } -// MARK: - RBDrawingView [WIP] +// MARK: - ORBDrawingView [WIP] -final class RBDrawingView: RenderBoxView, PlatformDrawable { +final class ORBDrawingView: OpenRenderBoxView, PlatformDrawable { var options: PlatformDrawableOptions { didSet { guard oldValue != options else { @@ -152,9 +152,9 @@ final class RBDrawingView: RenderBoxView, PlatformDrawable { private func updateOptions() { isOpaque = options.isOpaque #if os(iOS) || os(visionOS) - options.update(rbLayer: layer) + options.update(orbLayer: layer) #elseif os(macOS) - options.update(rbLayer: layer!) + options.update(orbLayer: layer!) #endif rendersFirstFrameAsynchronously = options.rendersFirstFrameAsynchronously } @@ -165,7 +165,7 @@ final class RBDrawingView: RenderBoxView, PlatformDrawable { } @AtomicBox - private var state: RBDrawingView.State = .init() + private var state: ORBDrawingView.State = .init() init(options: PlatformDrawableOptions) { self.options = options diff --git a/Sources/OpenSwiftUI/Render/DisplayList/RenderBoxView.swift b/Sources/OpenSwiftUI/Render/DisplayList/RenderBoxView.swift index 015d23d4a..e14e410b3 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/RenderBoxView.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/RenderBoxView.swift @@ -13,26 +13,26 @@ import QuartzCore import QuartzCore_Private import OpenRenderBoxShims -// MARK: - RenderBoxView +// MARK: - OpenRenderBoxView @objc -class RenderBoxView: PlatformGraphicsView { +class OpenRenderBoxView: PlatformGraphicsView { var rendersFirstFrameAsynchronously: Bool #if os(iOS) || os(visionOS) override class var layerClass: AnyClass { - RenderBoxLayer.self + OpenRenderBoxLayer.self } #endif - private func rbInit() { + private func orbInit() { #if os(iOS) || os(visionOS) let layer = layer layer.delegate = self layer.isOpaque = isOpaque #elseif os(macOS) wantsLayer = true - layer = RenderBoxLayer() + layer = OpenRenderBoxLayer() layerContentsRedrawPolicy = .duringViewResize let layer = layer! layer.delegate = self @@ -43,17 +43,17 @@ class RenderBoxView: PlatformGraphicsView { override init(frame: CGRect) { rendersFirstFrameAsynchronously = false super.init(frame: frame) - rbInit() + orbInit() } required init?(coder: NSCoder) { rendersFirstFrameAsynchronously = false super.init(coder: coder) - rbInit() + orbInit() } deinit { - (layer as! RenderBoxLayer).waitUntilAsyncRenderingCompleted() + (layer as! OpenRenderBoxLayer).waitUntilAsyncRenderingCompleted() } #if os(iOS) || os(visionOS) @@ -87,7 +87,7 @@ class RenderBoxView: PlatformGraphicsView { } } -extension RenderBoxView: ORBLayerDelegate { +extension OpenRenderBoxView: ORBLayerDelegate { func rbLayer(_ layer: ORBLayer, draw inDisplayList: ORBDisplayList) { draw(inDisplayList: inDisplayList) } @@ -103,15 +103,15 @@ extension RenderBoxView: ORBLayerDelegate { #endif } -// MARK: - RenderBoxLayer +// MARK: - OpenRenderBoxLayer -private class RenderBoxLayer: ORBLayer { +private class OpenRenderBoxLayer: ORBLayer { override var needsSynchronousUpdate: Bool { get { guard super.needsSynchronousUpdate else { return false } - guard let delegate = delegate as? RenderBoxView, + guard let delegate = delegate as? OpenRenderBoxView, delegate.rendersFirstFrameAsynchronously else { return true diff --git a/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift b/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift index c70cfbfb8..738903113 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift @@ -55,7 +55,7 @@ final class UIViewPlatformViewDefinition: PlatformViewDefinition, @unchecked Sen override static func makeDrawingView(options: PlatformDrawableOptions) -> any PlatformDrawable { let view: UIView & PlatformDrawable if options.isAccelerated && ORBDevice.isSupported() { - view = RBDrawingView(options: options) + view = ORBDrawingView(options: options) } else { view = CGDrawingView(options: options) } @@ -75,8 +75,8 @@ final class UIViewPlatformViewDefinition: PlatformViewDefinition, @unchecked Sen } override static func getRBLayer(drawingView: AnyObject) -> AnyObject? { - guard let rbView = drawingView as? RBDrawingView else { return nil } - return rbView.layer + guard let orbView = drawingView as? ORBDrawingView else { return nil } + return orbView.layer } override static func setIgnoresEvents(_ state: Bool, of view: AnyObject) { diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/CAHostingLayerPlatformDefinition.swift b/Sources/OpenSwiftUICore/Render/DisplayList/CAHostingLayerPlatformDefinition.swift index a2d12922f..0b3cb71b7 100644 --- a/Sources/OpenSwiftUICore/Render/DisplayList/CAHostingLayerPlatformDefinition.swift +++ b/Sources/OpenSwiftUICore/Render/DisplayList/CAHostingLayerPlatformDefinition.swift @@ -42,7 +42,7 @@ final class CAHostingLayerPlatformDefinition: PlatformViewDefinition, @unchecked override static func makeDrawingView(options: PlatformDrawableOptions) -> any PlatformDrawable { let layer: CALayer & PlatformDrawable if options.isAccelerated && ORBDevice.isSupported() { - layer = RBDrawingLayer(options: options) + layer = ORBDrawingLayer(options: options) } else { layer = CGDrawingLayer(options: options) } @@ -160,9 +160,9 @@ private final class CGDrawingLayer: CALayer, PlatformDrawable { } } -// MARK: - RBDrawingLayer +// MARK: - ORBDrawingLayer -private final class RBDrawingLayer: ORBLayer, PlatformDrawable { +private final class ORBDrawingLayer: ORBLayer, PlatformDrawable { var options: PlatformDrawableOptions { didSet { guard oldValue != options else { return } @@ -176,7 +176,7 @@ private final class RBDrawingLayer: ORBLayer, PlatformDrawable { } @AtomicBox - private var state: RBDrawingLayer.State = .init() + private var state: ORBDrawingLayer.State = .init() init(options: PlatformDrawableOptions) { self.options = options @@ -191,7 +191,7 @@ private final class RBDrawingLayer: ORBLayer, PlatformDrawable { private func updateOptions() { isOpaque = options.isOpaque - options.update(rbLayer: self) + options.update(orbLayer: self) } static var allowsContentsMultiplyColor: Bool { false } diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.GraphicsRenderer.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.GraphicsRenderer.swift index 3908ffa50..aa5bf5256 100644 --- a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.GraphicsRenderer.swift +++ b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.GraphicsRenderer.swift @@ -17,7 +17,7 @@ extension DisplayList { } private struct Cache { - var callbacks: [CallbackKey: Void /* RBDisplayListContents */] + var callbacks: [CallbackKey: Void /* ORBDisplayListContents */] var animators: [AnimatorKey: Void /* _DisplayList_AnyEffectAnimator */ ] struct CallbackKey: Hashable { diff --git a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift index f8038976e..f9d7f34ea 100644 --- a/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift +++ b/Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift @@ -174,7 +174,7 @@ extension DisplayList { indirect case platformLayer(any PlatformLayerFactory) indirect case text(StyledTextContentView, CGSize) indirect case flattened(DisplayList, CGPoint, RasterizationOptions) - indirect case drawing(any RBDisplayListContents, CGPoint, RasterizationOptions) + indirect case drawing(any ORBDisplayListContents, CGPoint, RasterizationOptions) indirect case view(any _DisplayList_ViewFactory) case placeholder(id: Identity) } @@ -497,7 +497,7 @@ extension DisplayList { private struct Contents { var list: DisplayList var origin: CGPoint - var rbList: ORBDisplayListContents + var orbList: ORBDisplayListContents var nextTime: Time var numericValue: Float? } @@ -559,6 +559,4 @@ extension DisplayList.Item { } } -package class ORBDisplayListContents {} -package class ORBDisplayListInterpolator {} package struct ORBTransition {} diff --git a/Sources/OpenSwiftUICore/Render/PlatformDrawable.swift b/Sources/OpenSwiftUICore/Render/PlatformDrawable.swift index 82d6d8815..8bfad6b1f 100644 --- a/Sources/OpenSwiftUICore/Render/PlatformDrawable.swift +++ b/Sources/OpenSwiftUICore/Render/PlatformDrawable.swift @@ -45,8 +45,8 @@ public struct PlatformDrawableContent: @unchecked Sendable { case graphicsCallback((inout GraphicsContext, CGSize) -> ()) case platformCallback((CGSize) -> ()) case displayList(DisplayList, CGPoint, Time) - case rbDisplayList(any RBDisplayListContents, CGPoint) - case rbInterpolator(RBDisplayListInterpolator, Float, CGPoint) + case orbDisplayList(any ORBDisplayListContents, CGPoint) + case orbInterpolator(ORBDisplayListInterpolator, Float, CGPoint) case empty } @@ -141,9 +141,9 @@ public struct PlatformDrawableOptions: Equatable, Sendable { } #endif - public func update(rbLayer: AnyObject) { + public func update(orbLayer: AnyObject) { #if canImport(Darwin) - let layer = rbLayer as! ORBLayer + let layer = orbLayer as! ORBLayer layer.colorMode = base.resolvedColorMode layer.rendersAsynchronously = rendersAsynchronously layer.maxDrawableCount = Int(base.maxDrawableCount) diff --git a/Sources/OpenSwiftUICore/Render/RasterizationOptions.swift b/Sources/OpenSwiftUICore/Render/RasterizationOptions.swift index cc24e7d1b..34d0cbaae 100644 --- a/Sources/OpenSwiftUICore/Render/RasterizationOptions.swift +++ b/Sources/OpenSwiftUICore/Render/RasterizationOptions.swift @@ -88,7 +88,7 @@ package struct RasterizationOptions: Equatable { package var colorMode: ColorRenderingMode - package var rbColorMode: Int32? + package var orbColorMode: Int32? package var flags: RasterizationOptions.Flags @@ -96,12 +96,12 @@ package struct RasterizationOptions: Equatable { package init( colorMode: ColorRenderingMode = .nonLinear, - rbColorMode: Int32? = nil, + orbColorMode: Int32? = nil, flags: RasterizationOptions.Flags = .defaultFlags, maxDrawableCount: Int8 = 3 ) { self.colorMode = colorMode - self.rbColorMode = rbColorMode + self.orbColorMode = orbColorMode self.flags = flags self.maxDrawableCount = maxDrawableCount } @@ -138,7 +138,7 @@ package struct RasterizationOptions: Equatable { #if !OPENSWIFTUI_ANY_ATTRIBUTE_FIX package var resolvedColorMode: ORBColor.Mode { - if let mode = rbColorMode { + if let mode = orbColorMode { return ORBColor.Mode(rawValue: mode) } else { let alphaOnly = alphaOnly @@ -176,8 +176,8 @@ package struct RasterizationOptions: Equatable { extension RasterizationOptions: ProtobufMessage { package func encode(to encoder: inout ProtobufEncoder) { encoder.enumField(1, colorMode, defaultValue: .nonLinear) - if let rbColorMode { - encoder.intField(2, Int(rbColorMode)) + if let orbColorMode { + encoder.intField(2, Int(orbColorMode)) } encoder.intField(3, Int(flags.rawValue)) encoder.intField(4, Int(maxDrawableCount)) @@ -188,7 +188,7 @@ extension RasterizationOptions: ProtobufMessage { while let field = try decoder.nextField() { switch field.tag { case 1: options.colorMode = try decoder.enumField(field) ?? .nonLinear - case 2: options.rbColorMode = Int32(try decoder.intField(field)) + case 2: options.orbColorMode = Int32(try decoder.intField(field)) case 3: options.flags = Flags(rawValue: UInt32(try decoder.intField(field))) case 4: options.maxDrawableCount = Int8(try decoder.intField(field)) default: try decoder.skipField(field) diff --git a/Sources/OpenSwiftUICore/Render/RendererConfiguration.swift b/Sources/OpenSwiftUICore/Render/RendererConfiguration.swift index c837130ff..4547ff897 100644 --- a/Sources/OpenSwiftUICore/Render/RendererConfiguration.swift +++ b/Sources/OpenSwiftUICore/Render/RendererConfiguration.swift @@ -45,7 +45,7 @@ public struct _RendererConfiguration { /// When non-nil overrides colorMode with a member of the /// `RBColorMode` enum, specified as its raw integer value. - public var rbColorMode: Int32? + public var orbColorMode: Int32? /// When true the view will build and submit its command buffer /// asynchronously. diff --git a/Sources/OpenSwiftUICore/Shape/Path.swift b/Sources/OpenSwiftUICore/Shape/Path.swift index 790e37720..166912d6b 100644 --- a/Sources/OpenSwiftUICore/Shape/Path.swift +++ b/Sources/OpenSwiftUICore/Shape/Path.swift @@ -27,7 +27,7 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { #if canImport(CoreGraphics) || !OPENSWIFTUI_CF_CGTYPES case cgPath #endif - case rbPath + case orbPath case buffer } @@ -43,8 +43,8 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { #endif package init(takingPath path: ORBPath) { - kind = .rbPath - data = PathData(rbPath: path) + kind = .orbPath + data = PathData(orbPath: path) } private func prepareBuffer() { @@ -54,8 +54,8 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { case .cgPath: path = ORBPath(cgPath: data.cgPath.takeRetainedValue()) #endif - case .rbPath: - path = data.rbPath + case .orbPath: + path = data.orbPath case .buffer: return } @@ -135,27 +135,27 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { #if canImport(CoreGraphics) || !OPENSWIFTUI_CF_CGTYPES @inline(__always) fileprivate var cgPath: CGPath { - let rbPath: ORBPath + let orbPath: ORBPath switch kind { case .cgPath: return data.cgPath.takeUnretainedValue() - case .rbPath: - rbPath = data.rbPath + case .orbPath: + orbPath = data.orbPath case .buffer: let storage = unsafeBitCast(self, to: ORBPath.Storage.self) - rbPath = ORBPath(storage: storage, callbacks: Self.bufferCallbacks) + orbPath = ORBPath(storage: storage, callbacks: Self.bufferCallbacks) } - return rbPath.cgPath + return orbPath.cgPath } #endif @inline(__always) - fileprivate var rbPath: ORBPath { + fileprivate var orbPath: ORBPath { switch kind { case .cgPath: return ORBPath(cgPath: data.cgPath.takeUnretainedValue()) - case .rbPath: - return data.rbPath + case .orbPath: + return data.orbPath case .buffer: let storage = unsafeBitCast(self, to: ORBPath.Storage.self) return ORBPath(storage: storage, callbacks: Self.bufferCallbacks) @@ -164,14 +164,14 @@ public struct Path: Equatable, LosslessStringConvertible, @unchecked Sendable { @inline(__always) fileprivate func retainRBPath() -> ORBPath { - let rbPath = rbPath - rbPath.retain() - return rbPath + let orbPath = orbPath + orbPath.retain() + return orbPath } @usableFromInline package static func == (lhs: PathBox, rhs: PathBox) -> Bool { - return lhs.rbPath.isEqual(to: rhs.rbPath) + return lhs.orbPath.isEqual(to: rhs.orbPath) } } diff --git a/Sources/OpenSwiftUICore/Shape/PathData.swift b/Sources/OpenSwiftUICore/Shape/PathData.swift index 69d0de6aa..cab50cd91 100644 --- a/Sources/OpenSwiftUICore/Shape/PathData.swift +++ b/Sources/OpenSwiftUICore/Shape/PathData.swift @@ -16,7 +16,7 @@ package import OpenRenderBoxShims /// /// typedef union PathData { /// CGPathRef cgPath; // 8 bytes (pointer) -/// ORBPath rbPath; // 16 bytes (2 pointers) +/// ORBPath orbPath; // 16 bytes (2 pointers) /// uint8_t buffer[0x60]; // 96 bytes /// } PathData; package struct PathData { @@ -74,11 +74,11 @@ package struct PathData { // MARK: - ORBPath access - package init(rbPath: ORBPath) { - self.rbPath = rbPath + package init(orbPath: ORBPath) { + self.orbPath = orbPath } - package var rbPath: ORBPath { + package var orbPath: ORBPath { get { withUnsafeBytes(of: storage) { buffer in buffer.load(as: ORBPath.self) diff --git a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift index fa29dccb8..12ff8319f 100644 --- a/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift +++ b/Sources/OpenSwiftUICore/Shape/ShapeStyle/ShapeStyleResolver.swift @@ -34,7 +34,7 @@ package struct _ShapeStyle_ResolverMode: Equatable { self.options = options } - package init(rbSymbolStyleMask mask: UInt32, location: Image.Location) { + package init(orbSymbolStyleMask mask: UInt32, location: Image.Location) { let bundle: Bundle? var options: Options if mask & (1 << 9) != 0 { diff --git a/Sources/OpenSwiftUICore/Util/RenderBoxShims.swift b/Sources/OpenSwiftUICore/Util/RenderBoxShims.swift index 4958cd424..0220387f7 100644 --- a/Sources/OpenSwiftUICore/Util/RenderBoxShims.swift +++ b/Sources/OpenSwiftUICore/Util/RenderBoxShims.swift @@ -2,6 +2,6 @@ // RenderBoxShims.swift // OpenSwiftUICore -public protocol RBDisplayListContents {} // RenderBox.RBDisplayListContents +public protocol ORBDisplayListContents {} // RenderBox.RBDisplayListContents -class RBDisplayListInterpolator {} +package class ORBDisplayListInterpolator {} diff --git a/Sources/OpenSwiftUICore/View/Image/GraphicsImage.swift b/Sources/OpenSwiftUICore/View/Image/GraphicsImage.swift index 3a2973efa..9febccc38 100644 --- a/Sources/OpenSwiftUICore/View/Image/GraphicsImage.swift +++ b/Sources/OpenSwiftUICore/View/Image/GraphicsImage.swift @@ -97,7 +97,7 @@ package struct GraphicsImage: Equatable, Sendable { switch contents { case let .vectorGlyph(resolvedVectorGlyph): return .init( - rbSymbolStyleMask: resolvedVectorGlyph.animator.styleMask, + orbSymbolStyleMask: resolvedVectorGlyph.animator.styleMask, location: resolvedVectorGlyph.location ) case .none: @@ -199,7 +199,7 @@ package struct ResolvedVectorGlyph: Equatable { animator.glyph = glyph animator.variableValue = variableValue animator.flipsRightToLeft = flipsRightToLeft - animator.renderingMode = context.effectiveSymbolRenderingMode?.rbRenderingMode ?? 255 + animator.renderingMode = context.effectiveSymbolRenderingMode?.orbRenderingMode ?? 255 let direction = context.environment.layoutDirection let version = animator.version let options = context.options @@ -231,14 +231,14 @@ package struct ResolvedVectorGlyph: Equatable { } package var renderingMode: SymbolRenderingMode.Storage? { - SymbolRenderingMode(rbRenderingMode: animator.renderingMode)?.storage + SymbolRenderingMode(orbRenderingMode: animator.renderingMode)?.storage } package var resolvedRenderingMode: SymbolRenderingMode.Storage? { #if OPENSWIFTUI_LINK_COREUI && OPENSWIFTUI_RENDERBOX - let rbMode = animator.renderingMode - guard rbMode == 0 else { - return SymbolRenderingMode(rbRenderingMode: rbMode)?.storage + let orbMode = animator.renderingMode + guard orbMode == 0 else { + return SymbolRenderingMode(orbRenderingMode: orbMode)?.storage } guard let glyph = animator.glyph else { return .preferred @@ -258,7 +258,7 @@ package struct ResolvedVectorGlyph: Equatable { } package var styleResolverMode: ShapeStyle.ResolverMode { - .init(rbSymbolStyleMask: animator.styleMask, location: location) + .init(orbSymbolStyleMask: animator.styleMask, location: location) } // MARK: - Methods diff --git a/Sources/OpenSwiftUICore/View/Image/SymbolRenderingMode.swift b/Sources/OpenSwiftUICore/View/Image/SymbolRenderingMode.swift index 6b97e0029..e94e0779d 100644 --- a/Sources/OpenSwiftUICore/View/Image/SymbolRenderingMode.swift +++ b/Sources/OpenSwiftUICore/View/Image/SymbolRenderingMode.swift @@ -101,7 +101,7 @@ public struct SymbolRenderingMode: Sendable { // MARK: - SymbolRenderingMode + RB Rendering Mode extension SymbolRenderingMode { - package var rbRenderingMode: UInt32 { + package var orbRenderingMode: UInt32 { switch storage { case .monochrome: 1 case .multicolor: 2 @@ -114,7 +114,7 @@ extension SymbolRenderingMode { } } - package init?(rbRenderingMode mode: UInt32) { + package init?(orbRenderingMode mode: UInt32) { switch mode { case 0: self = .preferred case 1: self = .monochrome diff --git a/Sources/OpenSwiftUICore/View/Image/VectorImageLayer.swift b/Sources/OpenSwiftUICore/View/Image/VectorImageLayer.swift index 5d03bf5ce..d3acbc651 100644 --- a/Sources/OpenSwiftUICore/View/Image/VectorImageLayer.swift +++ b/Sources/OpenSwiftUICore/View/Image/VectorImageLayer.swift @@ -42,7 +42,7 @@ package struct VectorImageLayer: Hashable { contents.size } - package var displayList: any RBDisplayListContents { + package var displayList: any ORBDisplayListContents { contents.displayList } @@ -72,7 +72,7 @@ open class VectorImageContents { _openSwiftUIBaseClassAbstractMethod() } - open var displayList: any RBDisplayListContents { + open var displayList: any ORBDisplayListContents { _openSwiftUIBaseClassAbstractMethod() } diff --git a/Sources/OpenSwiftUICore/View/Text/Text/Text+View.swift b/Sources/OpenSwiftUICore/View/Text/Text/Text+View.swift index 94d895bd9..23ae3e6f6 100644 --- a/Sources/OpenSwiftUICore/View/Text/Text/Text+View.swift +++ b/Sources/OpenSwiftUICore/View/Text/Text/Text+View.swift @@ -638,7 +638,7 @@ package class ResolvedStyledText: CustomStringConvertible { for size: CGSize, renderer: TextRendererBoxBase?, deviceScale: CGFloat - ) -> any RBDisplayListContents { + ) -> any ORBDisplayListContents { _openSwiftUIUnimplementedFailure() } } diff --git a/Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/CGPath+OpenSwiftUI.m b/Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/CGPath+OpenSwiftUI.m index 62cdfa2d2..b53577f30 100644 --- a/Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/CGPath+OpenSwiftUI.m +++ b/Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/CGPath+OpenSwiftUI.m @@ -234,9 +234,9 @@ CGPathRef _CGPathCreateRoundedRect(CGRect rect, CGFloat cornerWidth, CGFloat cor RBPathRelease(rbPath); return cgPath; #else - ORBPath rbPath = ORBPathMakeRoundedRect(rect, cornerWidth, cornerHeight, ORBPathRoundedCornerStyleContinuous, NULL); - CGPathRef cgPath = ORBPathCopyCGPath(rbPath); - ORBPathRelease(rbPath); + ORBPath orbPath = ORBPathMakeRoundedRect(rect, cornerWidth, cornerHeight, ORBPathRoundedCornerStyleContinuous, NULL); + CGPathRef cgPath = ORBPathCopyCGPath(orbPath); + ORBPathRelease(orbPath); return cgPath; #endif } diff --git a/Sources/OpenSwiftUI_SPI/Util/PathData.h b/Sources/OpenSwiftUI_SPI/Util/PathData.h index 615544ec6..b07c2c411 100644 --- a/Sources/OpenSwiftUI_SPI/Util/PathData.h +++ b/Sources/OpenSwiftUI_SPI/Util/PathData.h @@ -28,9 +28,9 @@ typedef union PathData { CGPathRef cgPath; #endif #if OPENSWIFTUI_RENDERBOX - RBPath rbPath; + RBPath orbPath; #else - ORBPath rbPath; + ORBPath orbPath; #endif uint8_t buffer[0x60]; } PathData;