Removed DivBlockModelingContext.highPriorityImageHolderFactory

commit_hash:7a0bf6041654490dffc9cbc136721b105fb24f3d
This commit is contained in:
pkurchatov
2025-01-16 20:28:54 +03:00
parent 865a5b895a
commit 05ddf45746
4 changed files with 2 additions and 17 deletions
@@ -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()
-1
View File
@@ -318,7 +318,6 @@ public final class DivKitComponents {
lastVisibleBoundsCache: lastVisibleBoundsCache,
imageHolderFactory: imageHolderFactory
.withCache(cachedImageHolders),
highPriorityImageHolderFactory: nil,
divCustomBlockFactory: divCustomBlockFactory,
fontProvider: fontProvider,
flagsInfo: flagsInfo,
@@ -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)
),
@@ -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))