From 05ddf45746e6f403ec7b2bb47d1f41ddfa75422b Mon Sep 17 00:00:00 2001 From: pkurchatov Date: Thu, 16 Jan 2025 20:24:58 +0300 Subject: [PATCH] Removed DivBlockModelingContext.highPriorityImageHolderFactory commit_hash:7a0bf6041654490dffc9cbc136721b105fb24f3d --- client/ios/DivKit/DivBlockModelingContext.swift | 5 ----- client/ios/DivKit/DivKitComponents.swift | 1 - .../Extensions/DivImage/DivImageExtensions.swift | 10 +--------- .../DivKit/Extensions/DivImage/DivImageProtocol.swift | 3 +-- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/client/ios/DivKit/DivBlockModelingContext.swift b/client/ios/DivKit/DivBlockModelingContext.swift index 97783b689..f545e35b7 100644 --- a/client/ios/DivKit/DivBlockModelingContext.swift +++ b/client/ios/DivKit/DivBlockModelingContext.swift @@ -18,7 +18,6 @@ public struct DivBlockModelingContext { let visibilityCounter: DivVisibilityCounter let lastVisibleBoundsCache: DivLastVisibleBoundsCache public let imageHolderFactory: DivImageHolderFactory - let highPriorityImageHolderFactory: DivImageHolderFactory? let divCustomBlockFactory: DivCustomBlockFactory public let fontProvider: DivFontProvider let flagsInfo: DivFlagsInfo @@ -60,7 +59,6 @@ public struct DivBlockModelingContext { visibilityCounter: DivVisibilityCounter? = nil, lastVisibleBoundsCache: DivLastVisibleBoundsCache? = nil, imageHolderFactory: DivImageHolderFactory, - highPriorityImageHolderFactory: DivImageHolderFactory? = nil, divCustomBlockFactory: DivCustomBlockFactory? = nil, fontProvider: DivFontProvider? = nil, flagsInfo: DivFlagsInfo = .default, @@ -90,7 +88,6 @@ public struct DivBlockModelingContext { visibilityCounter: visibilityCounter, lastVisibleBoundsCache: lastVisibleBoundsCache, imageHolderFactory: imageHolderFactory, - highPriorityImageHolderFactory: highPriorityImageHolderFactory, divCustomBlockFactory: divCustomBlockFactory, fontProvider: fontProvider, flagsInfo: flagsInfo, @@ -125,7 +122,6 @@ public struct DivBlockModelingContext { visibilityCounter: DivVisibilityCounter?, lastVisibleBoundsCache: DivLastVisibleBoundsCache?, imageHolderFactory: DivImageHolderFactory, - highPriorityImageHolderFactory: DivImageHolderFactory?, divCustomBlockFactory: DivCustomBlockFactory?, fontProvider: DivFontProvider?, flagsInfo: DivFlagsInfo, @@ -158,7 +154,6 @@ public struct DivBlockModelingContext { self.visibilityCounter = visibilityCounter ?? DivVisibilityCounter() self.lastVisibleBoundsCache = lastVisibleBoundsCache ?? DivLastVisibleBoundsCache() self.imageHolderFactory = imageHolderFactory - self.highPriorityImageHolderFactory = highPriorityImageHolderFactory self.divCustomBlockFactory = divCustomBlockFactory ?? EmptyDivCustomBlockFactory() self.flagsInfo = flagsInfo self.fontProvider = fontProvider ?? DefaultFontProvider() diff --git a/client/ios/DivKit/DivKitComponents.swift b/client/ios/DivKit/DivKitComponents.swift index 77a7f8eff..ee65dfd2d 100644 --- a/client/ios/DivKit/DivKitComponents.swift +++ b/client/ios/DivKit/DivKitComponents.swift @@ -318,7 +318,6 @@ public final class DivKitComponents { lastVisibleBoundsCache: lastVisibleBoundsCache, imageHolderFactory: imageHolderFactory .withCache(cachedImageHolders), - highPriorityImageHolderFactory: nil, divCustomBlockFactory: divCustomBlockFactory, fontProvider: fontProvider, flagsInfo: flagsInfo, diff --git a/client/ios/DivKit/Extensions/DivImage/DivImageExtensions.swift b/client/ios/DivKit/Extensions/DivImage/DivImageExtensions.swift index 724e8c77c..d0681b4f2 100644 --- a/client/ios/DivKit/Extensions/DivImage/DivImageExtensions.swift +++ b/client/ios/DivKit/Extensions/DivImage/DivImageExtensions.swift @@ -17,16 +17,8 @@ extension DivImage: DivBlockModeling, DivImageProtocol { let expressionResolver = context.expressionResolver let highPriority = resolveHighPriorityPreviewShow(expressionResolver) - let imageHolderFactory: DivImageHolderFactory = if highPriority, - let highPriorityImageHolderFactory = context - .highPriorityImageHolderFactory { - highPriorityImageHolderFactory - } else { - context.imageHolderFactory - } - return ImageBlock( - imageHolder: imageHolderFactory.make( + imageHolder: context.imageHolderFactory.make( resolveImageUrl(expressionResolver), resolvePlaceholder(expressionResolver, highPriority: highPriority) ), diff --git a/client/ios/DivKit/Extensions/DivImage/DivImageProtocol.swift b/client/ios/DivKit/Extensions/DivImage/DivImageProtocol.swift index 69ce44069..89c8eacdb 100644 --- a/client/ios/DivKit/Extensions/DivImage/DivImageProtocol.swift +++ b/client/ios/DivKit/Extensions/DivImage/DivImageProtocol.swift @@ -21,8 +21,7 @@ extension DivImageProtocol { _ expressionResolver: ExpressionResolver, highPriority: Bool = false ) -> ImagePlaceholder { - if - let base64 = resolvePreview(expressionResolver) { + if let base64 = resolvePreview(expressionResolver) { .imageData(ImageData(base64: base64, highPriority: highPriority)) } else { .color(resolvePlaceholderColor(expressionResolver))