Minor controller cleanup

Reviewed By: kartavya-ramnani

Differential Revision: D58526776

fbshipit-source-id: 9bd4423fe850a836e827aacc3d5d504debb5ecfc

vito/core-java-impl/src/main/java/com/facebook/fresco/vito/core/impl/FrescoController2Impl.kt

@@ -50,24 +50,24 @@ import com.facebook.imagepipeline.image.ImmutableQualityInfo
 import java.util.concurrent.Executor
 
 open class FrescoController2Impl(
- private val mConfig: FrescoVitoConfig,
- private val mHierarcher: Hierarcher,
- private val mLightweightBackgroundThreadExecutor: Executor,
- private val mUiThreadExecutor: Executor,
- private val mImagePipeline: VitoImagePipeline,
- private val mGlobalImageListener: VitoImageRequestListener?,
- private val mDebugOverlayFactory: DebugOverlayFactory2,
- private val mImagePerfListenerSupplier: Supplier<ControllerListener2<ImageInfo>>?,
- private val mVitoImagePerfListener: VitoImagePerfListener
+ private val config: FrescoVitoConfig,
+ private val hierarcher: Hierarcher,
+ private val lightweightBackgroundThreadExecutor: Executor,
+ private val uiThreadExecutor: Executor,
+ private val imagePipeline: VitoImagePipeline,
+ private val globalImageListener: VitoImageRequestListener?,
+ private val debugOverlayFactory: DebugOverlayFactory2,
+ private val imagePerfListenerSupplier: Supplier<ControllerListener2<ImageInfo>>?,
+ private val vitoImagePerfListener: VitoImagePerfListener
 ) : DrawableDataSubscriber, FrescoController2 {
  override fun <T : Drawable> createDrawable(): T where T : FrescoDrawableInterface {
  return FrescoDrawable2Impl(
- mConfig.useNewReleaseCallback(), mImagePerfListenerSupplier?.get(), mVitoImagePerfListener)
+ config.useNewReleaseCallback(), imagePerfListenerSupplier?.get(), vitoImagePerfListener)
  as T
  }
 
  override fun fetch(
- drawable: FrescoDrawableInterface,
+ frescoDrawable: FrescoDrawableInterface,
  imageRequest: VitoImageRequest,
  callerContext: Any?,
  contextChain: ContextChain?,
@@ -77,14 +77,12 @@ open class FrescoController2Impl(
  viewportDimensions: Rect?,
  vitoImageRequestListener: VitoImageRequestListener?
  ): Boolean {
- if (drawable !is FrescoDrawable2Impl) {
- FLog.e(TAG, "Drawable not supported $drawable")
+ if (frescoDrawable !is FrescoDrawable2Impl) {
+ FLog.e(TAG, "Drawable not supported $frescoDrawable")
  return false
  }
- val frescoDrawable = drawable
-
  // Fast path for null-URIs
- if (mConfig.fastPathForEmptyRequests() && imageRequest.imageSource is EmptyImageSource) {
+ if (config.fastPathForEmptyRequests() && imageRequest.imageSource is EmptyImageSource) {
  emptyRequestFastPath(frescoDrawable, imageRequest, callerContext)
  return true
  }
@@ -108,7 +106,7 @@ open class FrescoController2Impl(
  frescoDrawable.imageRequest = imageRequest
  frescoDrawable.callerContext = callerContext
  frescoDrawable.imageListener = listener
- frescoDrawable.setVitoImageRequestListener(mGlobalImageListener)
+ frescoDrawable.setVitoImageRequestListener(globalImageListener)
  frescoDrawable.setLocalVitoImageRequestListener(vitoImageRequestListener)
 
  // Setup local perf data listener
@@ -122,7 +120,7 @@ open class FrescoController2Impl(
 
  // Set layers that are always visible
  frescoDrawable.setOverlayDrawable(
- mHierarcher.buildOverlayDrawable(imageRequest.resources, imageRequest.imageOptions))
+ hierarcher.buildOverlayDrawable(imageRequest.resources, imageRequest.imageOptions))
 
  // We're fetching a new image, so we're updating the ID
  val imageId = generateIdentifier()
@@ -145,18 +143,18 @@ open class FrescoController2Impl(
  // Immediately display the actual image.
  setActualImage(frescoDrawable, imageRequest, bitmapRef, true, null)
  frescoDrawable.setFetchSubmitted(true)
- mDebugOverlayFactory.update(frescoDrawable, extras)
+ debugOverlayFactory.update(frescoDrawable, extras)
  true
  } finally {
  CloseableReference.closeSafely(bitmapRef)
  }
  } else if (imageRequest.imageSource is DrawableImageSource) {
  val actualImageDrawable = (imageRequest.imageSource as DrawableImageSource).drawable
  val actualImageWrapperDrawable = frescoDrawable.actualImageWrapper
- mHierarcher.setupActualImageWrapper(
- actualImageWrapperDrawable, imageRequest.imageOptions, drawable.callerContext)
+ hierarcher.setupActualImageWrapper(
+ actualImageWrapperDrawable, imageRequest.imageOptions, frescoDrawable.callerContext)
  val actualDrawable =
- mHierarcher.applyRoundingOptions(
+ hierarcher.applyRoundingOptions(
  imageRequest.resources, actualImageDrawable, imageRequest.imageOptions)
  actualImageWrapperDrawable.setCurrent(actualDrawable)
  frescoDrawable.setImage(actualImageWrapperDrawable, null)
@@ -168,7 +166,7 @@ open class FrescoController2Impl(
  }
  val imageInfoExtras: Map<String, Any> = extras.imageExtras ?: HashMap()
  frescoDrawable.internalListener.onFinalImageSet(
- drawable.imageId,
+ frescoDrawable.imageId,
  imageRequest,
  ImageOrigin.LOCAL,
  ImageInfoImpl(
@@ -179,24 +177,24 @@ open class FrescoController2Impl(
  imageInfoExtras),
  extras,
  actualDrawable)
- drawable.imagePerfListener.onImageSuccess(drawable, true)
- mDebugOverlayFactory.update(frescoDrawable, extras)
+ frescoDrawable.imagePerfListener.onImageSuccess(frescoDrawable, true)
+ debugOverlayFactory.update(frescoDrawable, extras)
  return true
  }
 
  // Check if the image is in cache
- val cachedImage = mImagePipeline.getCachedImage(imageRequest)
+ val cachedImage = imagePipeline.getCachedImage(imageRequest)
  var needsPlaceholderDrawable = true
  try {
  if (CloseableReference.isValid(cachedImage)) {
  frescoDrawable.imageOrigin = ImageOrigin.MEMORY_BITMAP_SHORTCUT
  val isIntermediateImage =
- mConfig.useIntermediateImagesAsPlaceholder() &&
+ config.useIntermediateImagesAsPlaceholder() &&
  cachedImage?.get()?.qualityInfo?.isOfFullQuality != true
  // Immediately display the actual image.
  setActualImage(frescoDrawable, imageRequest, cachedImage, true, null, isIntermediateImage)
  frescoDrawable.setFetchSubmitted(true)
- mDebugOverlayFactory.update(frescoDrawable, extras)
+ debugOverlayFactory.update(frescoDrawable, extras)
  if (!isIntermediateImage) {
  return true
  } else {
@@ -211,7 +209,7 @@ open class FrescoController2Impl(
  if (needsPlaceholderDrawable) {
  // The image is not in cache -> Set up layers visible until the image is available
  frescoDrawable.setProgressDrawable(
- mHierarcher.buildProgressDrawable(imageRequest.resources, imageRequest.imageOptions))
+ hierarcher.buildProgressDrawable(imageRequest.resources, imageRequest.imageOptions))
  // Immediately show the progress image and set progress to 0
  frescoDrawable.setProgress(0f)
  frescoDrawable.showProgressImmediately()
@@ -224,18 +222,18 @@ open class FrescoController2Impl(
  return@Runnable // We're trying to load a different image -> ignore
  }
  val dataSource =
- mImagePipeline.fetchDecodedImage(
+ imagePipeline.fetchDecodedImage(
  imageRequest, callerContext, frescoDrawable.imageOriginListener, imageId)
  frescoDrawable.setDataSource(imageId, dataSource)
- dataSource.subscribe(frescoDrawable, mUiThreadExecutor)
+ dataSource.subscribe(frescoDrawable, uiThreadExecutor)
  }
- if (mConfig.submitFetchOnBgThread()) {
- mLightweightBackgroundThreadExecutor.execute(fetchRunnable)
+ if (config.submitFetchOnBgThread()) {
+ lightweightBackgroundThreadExecutor.execute(fetchRunnable)
  } else {
  fetchRunnable.run()
  }
  frescoDrawable.setFetchSubmitted(true)
- mDebugOverlayFactory.update(frescoDrawable, null)
+ debugOverlayFactory.update(frescoDrawable, null)
  return false
  }
 
@@ -245,10 +243,10 @@ open class FrescoController2Impl(
  callerContext: Any?
  ) {
  frescoDrawable.close()
- frescoDrawable.setVitoImageRequestListener(mGlobalImageListener)
+ frescoDrawable.setVitoImageRequestListener(globalImageListener)
  frescoDrawable.internalListener.onEmptyEvent(callerContext)
  frescoDrawable.setOverlayDrawable(
- mHierarcher.buildOverlayDrawable(imageRequest.resources, imageRequest.imageOptions))
+ hierarcher.buildOverlayDrawable(imageRequest.resources, imageRequest.imageOptions))
  setUpPlaceholder(frescoDrawable, imageRequest, EMPTY_IMAGE_ID)
  }
 
@@ -258,38 +256,35 @@ open class FrescoController2Impl(
  imageId: Long
  ) {
  val placeholder =
- mHierarcher.buildPlaceholderDrawable(imageRequest.resources, imageRequest.imageOptions)
+ hierarcher.buildPlaceholderDrawable(imageRequest.resources, imageRequest.imageOptions)
  frescoDrawable.setPlaceholderDrawable(placeholder)
  frescoDrawable.setImageDrawable(null)
  frescoDrawable.internalListener.onPlaceholderSet(imageId, imageRequest, placeholder)
  }
 
- override fun releaseDelayed(drawable: FrescoDrawableInterface) {
- if (drawable !is FrescoDrawable2Impl) {
- FLog.e(TAG, "Drawable not supported $drawable")
+ override fun releaseDelayed(frescoDrawable: FrescoDrawableInterface) {
+ if (frescoDrawable !is FrescoDrawable2Impl) {
+ FLog.e(TAG, "Drawable not supported $frescoDrawable")
  return
  }
- val frescoDrawable = drawable
  frescoDrawable.imagePerfListener.onScheduleReleaseDelayed(frescoDrawable)
  frescoDrawable.scheduleReleaseDelayed()
  }
 
- override fun release(drawable: FrescoDrawableInterface) {
- if (drawable !is FrescoDrawable2Impl) {
- FLog.e(TAG, "Drawable not supported $drawable")
+ override fun release(frescoDrawable: FrescoDrawableInterface) {
+ if (frescoDrawable !is FrescoDrawable2Impl) {
+ FLog.e(TAG, "Drawable not supported $frescoDrawable")
  return
  }
- val frescoDrawable = drawable
  frescoDrawable.imagePerfListener.onScheduleReleaseNextFrame(frescoDrawable)
  frescoDrawable.scheduleReleaseNextFrame()
  }
 
- override fun releaseImmediately(drawable: FrescoDrawableInterface) {
- if (drawable !is FrescoDrawable2Impl) {
- FLog.e(TAG, "Drawable not supported $drawable")
+ override fun releaseImmediately(frescoDrawable: FrescoDrawableInterface) {
+ if (frescoDrawable !is FrescoDrawable2Impl) {
+ FLog.e(TAG, "Drawable not supported $frescoDrawable")
  return
  }
- val frescoDrawable = drawable
  frescoDrawable.imagePerfListener.onReleaseImmediately(frescoDrawable)
  frescoDrawable.releaseImmediately()
  }
@@ -303,10 +298,10 @@ open class FrescoController2Impl(
  isIntermediateImage: Boolean = false,
  ) {
  val actualImageWrapperDrawable = drawable.actualImageWrapper
- mHierarcher.setupActualImageWrapper(
+ hierarcher.setupActualImageWrapper(
  actualImageWrapperDrawable, imageRequest.imageOptions, drawable.callerContext)
  val actualDrawable =
- mHierarcher.buildActualImageDrawable(
+ hierarcher.buildActualImageDrawable(
  imageRequest.resources, imageRequest.imageOptions, image!!)
  actualImageWrapperDrawable.setCurrent(actualDrawable ?: NopDrawable)
  drawable.setImage(actualImageWrapperDrawable, image)
@@ -332,7 +327,7 @@ open class FrescoController2Impl(
  progress = dataSource.progress
  }
  drawable.setProgress(progress)
- mDebugOverlayFactory.update(drawable, extras)
+ debugOverlayFactory.update(drawable, extras)
  }
 
  override fun onNewResult(
@@ -361,7 +356,7 @@ open class FrescoController2Impl(
  dataSource: DataSource<CloseableReference<CloseableImage>>
  ) {
  val errorDrawable =
- mHierarcher.buildErrorDrawable(imageRequest.resources, imageRequest.imageOptions)
+ hierarcher.buildErrorDrawable(imageRequest.resources, imageRequest.imageOptions)
  drawable.setProgress(1f)
  drawable.setImageDrawable(errorDrawable)
  if (!drawable.isDefaultLayerIsOn) {
@@ -383,18 +378,16 @@ open class FrescoController2Impl(
  drawable.imageId, imageRequest, dataSource.failureCause)
  }
  drawable.imagePerfListener.onImageError(drawable)
- mDebugOverlayFactory.update(drawable, extras)
+ debugOverlayFactory.update(drawable, extras)
  }
 
  override fun onProgressUpdate(
  drawable: FrescoDrawable2Impl,
  imageRequest: VitoImageRequest,
  dataSource: DataSource<CloseableReference<CloseableImage>>
  ) {
- val isFinished = dataSource.isFinished
- val progress = dataSource.progress
- if (!isFinished) {
- drawable.setProgress(progress)
+ if (!dataSource.isFinished) {
+ drawable.setProgress(dataSource.progress)
  }
  }
 
@@ -404,9 +397,9 @@ open class FrescoController2Impl(
  // Notify listeners
  drawable.internalListener.onRelease(
  drawable.imageId, imageRequest, obtainExtras(null, null, drawable))
- if (mConfig.stopAnimationInOnRelease()) {
+ if (config.stopAnimationInOnRelease()) {
  // We automatically stop the animation if it was automatically started
- if (!mConfig.onlyStopAnimationWhenAutoPlayEnabled() ||
+ if (!config.onlyStopAnimationWhenAutoPlayEnabled() ||
  imageRequest.imageOptions.shouldAutoPlay()) {
  (drawable.actualImageDrawable as? Animatable)?.stop()
  }
@@ -422,7 +415,7 @@ open class FrescoController2Impl(
  if (drawable.drawableDataSubscriber !== this || !drawable.isFetchSubmitted) {
  return false
  }
- return if (mConfig.useSmartPropertyDiffing()) {
+ return if (config.useSmartPropertyDiffing()) {
  imageRequest.equalsIfHasImage(drawable.imageRequest, drawable.hasImage())
  } else {
  imageRequest.equals(drawable.imageRequest)
@@ -473,8 +466,6 @@ open class FrescoController2Impl(
 
  private fun notifyFinalResult(
  dataSource: DataSource<CloseableReference<CloseableImage>>?
- ): Boolean {
- return dataSource == null || dataSource.isFinished || dataSource.hasMultipleResults()
- }
+ ): Boolean = dataSource == null || dataSource.isFinished || dataSource.hasMultipleResults()
  }
 }