@@ -418,7 +418,7 @@ std::unique_ptr<DispatchEntry> createDispatchEntry(const IdGenerator& idGenerato
418418 if (inputTarget.useDefaultPointerTransform () && !zeroCoords) {
419419 const ui::Transform& transform = inputTarget.getDefaultPointerTransform ();
420420 return std::make_unique<DispatchEntry>(eventEntry, inputTargetFlags, transform,
421- inputTarget.displayTransform ,
421+ inputTarget.rawTransform ,
422422 inputTarget.globalScaleFactor , uid, vsyncId,
423423 windowId);
424424 }
@@ -439,7 +439,7 @@ std::unique_ptr<DispatchEntry> createDispatchEntry(const IdGenerator& idGenerato
439439 transform =
440440 &inputTarget.getTransformForPointer (firstMarkedBit (inputTarget.getPointerIds ()));
441441 const ui::Transform inverseTransform = transform->inverse ();
442- displayTransform = &inputTarget.displayTransform ;
442+ displayTransform = &inputTarget.rawTransform ;
443443
444444 // Iterate through all pointers in the event to normalize against the first.
445445 for (size_t i = 0 ; i < motionEntry.getPointerCount (); i++) {
@@ -929,15 +929,15 @@ InputTarget createInputTarget(const std::shared_ptr<Connection>& connection,
929929 const sp<android::gui::WindowInfoHandle>& windowHandle,
930930 InputTarget::DispatchMode dispatchMode,
931931 ftl::Flags<InputTarget::Flags> targetFlags,
932- const ui::Transform& displayTransform ,
932+ const ui::Transform& rawTransform ,
933933 std::optional<nsecs_t > firstDownTimeInTarget) {
934934 LOG_ALWAYS_FATAL_IF (connection == nullptr );
935935 InputTarget inputTarget{connection};
936936 inputTarget.windowHandle = windowHandle;
937937 inputTarget.dispatchMode = dispatchMode;
938938 inputTarget.flags = targetFlags;
939939 inputTarget.globalScaleFactor = windowHandle->getInfo ()->globalScaleFactor ;
940- inputTarget.displayTransform = displayTransform ;
940+ inputTarget.rawTransform = rawTransform ;
941941 inputTarget.firstDownTimeInTarget = firstDownTimeInTarget;
942942 return inputTarget;
943943}
@@ -3105,8 +3105,8 @@ void InputDispatcher::addGlobalMonitoringTargetsLocked(std::vector<InputTarget>&
31053105 InputTarget target{monitor.connection };
31063106 // target.firstDownTimeInTarget is not set for global monitors. It is only required in split
31073107 // touch and global monitoring works as intended even without setting firstDownTimeInTarget
3108- target.displayTransform = mWindowInfos .getDisplayTransform (displayId);
3109- target.setDefaultPointerTransform (target.displayTransform );
3108+ target.rawTransform = mWindowInfos .getDisplayTransform (displayId);
3109+ target.setDefaultPointerTransform (target.rawTransform );
31103110 inputTargets.push_back (target);
31113111 }
31123112}
@@ -4293,7 +4293,7 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked(
42934293 targets.emplace_back (fallbackTarget);
42944294 const ui::Transform displayTransform =
42954295 mWindowInfos .getDisplayTransform (motionEntry.displayId );
4296- targets.back ().displayTransform = displayTransform;
4296+ targets.back ().rawTransform = displayTransform;
42974297 targets.back ().setDefaultPointerTransform (displayTransform);
42984298 }
42994299 logOutboundMotionDetails (" cancel - " , motionEntry);
@@ -4378,7 +4378,7 @@ void InputDispatcher::synthesizePointerDownEventsForConnectionLocked(
43784378 targets.emplace_back (connection, targetFlags);
43794379 const ui::Transform displayTransform =
43804380 mWindowInfos .getDisplayTransform (motionEntry.displayId );
4381- targets.back ().displayTransform = displayTransform;
4381+ targets.back ().rawTransform = displayTransform;
43824382 targets.back ().setDefaultPointerTransform (displayTransform);
43834383 }
43844384 logOutboundMotionDetails (" down - " , motionEntry);
0 commit comments