From f06505aafd21f9c00923326aae4879e81fb1718a Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Thu, 5 Sep 2019 15:00:28 +0200
Subject: [PATCH] refactor(ivy): drop loadRendererFn argument from the listener
 instruction (#32495)

PR Close #32495
---
 .../core/src/render3/instructions/listener.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
index 87f31ee441..ba25e14423 100644
--- a/packages/core/src/render3/instructions/listener.ts
+++ b/packages/core/src/render3/instructions/listener.ts
@@ -37,7 +37,10 @@ import {BindingDirection, generatePropertyAliases, getCleanup, handleError, load
 export function ɵɵlistener(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): void {
-  listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver);
+  const lView = getLView();
+  const tNode = getPreviousOrParentTNode();
+  listenerInternal(
+      lView, lView[RENDERER], tNode, eventName, listenerFn, useCapture, eventTargetResolver);
 }
 
 /**
@@ -64,7 +67,10 @@ export function ɵɵlistener(
 export function ɵɵcomponentHostSyntheticListener(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): void {
-  listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver, loadComponentRenderer);
+  const lView = getLView();
+  const tNode = getPreviousOrParentTNode();
+  const renderer = loadComponentRenderer(tNode, lView);
+  listenerInternal(lView, renderer, tNode, eventName, listenerFn, useCapture, eventTargetResolver);
 }
 
 /**
@@ -101,11 +107,9 @@ function findExistingListener(
 }
 
 function listenerInternal(
-    eventName: string, listenerFn: (e?: any) => any, useCapture = false,
-    eventTargetResolver?: GlobalTargetResolver,
-    loadRendererFn?: ((tNode: TNode, lView: LView) => Renderer3) | null): void {
-  const lView = getLView();
-  const tNode = getPreviousOrParentTNode();
+    lView: LView, renderer: Renderer3, tNode: TNode, eventName: string,
+    listenerFn: (e?: any) => any, useCapture = false,
+    eventTargetResolver?: GlobalTargetResolver): void {
   const tView = lView[TVIEW];
   const firstTemplatePass = tView.firstTemplatePass;
   const tCleanup: false|any[] = firstTemplatePass && (tView.cleanup || (tView.cleanup = []));
@@ -120,7 +124,6 @@ function listenerInternal(
     const native = getNativeByTNode(tNode, lView) as RElement;
     const resolved = eventTargetResolver ? eventTargetResolver(native) : EMPTY_OBJ as any;
     const target = resolved.target || native;
-    const renderer = loadRendererFn ? loadRendererFn(tNode, lView) : lView[RENDERER];
     const lCleanup = getCleanup(lView);
     const lCleanupIndex = lCleanup.length;
     const idxOrTargetGetter = eventTargetResolver ?