InputTarget: s/displayTransform/rawTransform
Use the term "rawTransform" in InputTarget to better reflect its usage,
since it is used for MotionEvent's getRaw APIs.
This is to explicitly differentiate it from the displayTransform that we
use for hit testing.
Bug: 377846505
Test: atest inputflinger_tests
Flag: EXEMPT refactor
Change-Id: If07fc359152674fa2e3dc4aca10688943e857aab
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 0b1e849..bfab666 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -418,7 +418,7 @@
if (inputTarget.useDefaultPointerTransform() && !zeroCoords) {
const ui::Transform& transform = inputTarget.getDefaultPointerTransform();
return std::make_unique<DispatchEntry>(eventEntry, inputTargetFlags, transform,
- inputTarget.displayTransform,
+ inputTarget.rawTransform,
inputTarget.globalScaleFactor, uid, vsyncId,
windowId);
}
@@ -439,7 +439,7 @@
transform =
&inputTarget.getTransformForPointer(firstMarkedBit(inputTarget.getPointerIds()));
const ui::Transform inverseTransform = transform->inverse();
- displayTransform = &inputTarget.displayTransform;
+ displayTransform = &inputTarget.rawTransform;
// Iterate through all pointers in the event to normalize against the first.
for (size_t i = 0; i < motionEntry.getPointerCount(); i++) {
@@ -929,7 +929,7 @@
const sp<android::gui::WindowInfoHandle>& windowHandle,
InputTarget::DispatchMode dispatchMode,
ftl::Flags<InputTarget::Flags> targetFlags,
- const ui::Transform& displayTransform,
+ const ui::Transform& rawTransform,
std::optional<nsecs_t> firstDownTimeInTarget) {
LOG_ALWAYS_FATAL_IF(connection == nullptr);
InputTarget inputTarget{connection};
@@ -937,7 +937,7 @@
inputTarget.dispatchMode = dispatchMode;
inputTarget.flags = targetFlags;
inputTarget.globalScaleFactor = windowHandle->getInfo()->globalScaleFactor;
- inputTarget.displayTransform = displayTransform;
+ inputTarget.rawTransform = rawTransform;
inputTarget.firstDownTimeInTarget = firstDownTimeInTarget;
return inputTarget;
}
@@ -3105,8 +3105,8 @@
InputTarget target{monitor.connection};
// target.firstDownTimeInTarget is not set for global monitors. It is only required in split
// touch and global monitoring works as intended even without setting firstDownTimeInTarget
- target.displayTransform = mWindowInfos.getDisplayTransform(displayId);
- target.setDefaultPointerTransform(target.displayTransform);
+ target.rawTransform = mWindowInfos.getDisplayTransform(displayId);
+ target.setDefaultPointerTransform(target.rawTransform);
inputTargets.push_back(target);
}
}
@@ -4293,7 +4293,7 @@
targets.emplace_back(fallbackTarget);
const ui::Transform displayTransform =
mWindowInfos.getDisplayTransform(motionEntry.displayId);
- targets.back().displayTransform = displayTransform;
+ targets.back().rawTransform = displayTransform;
targets.back().setDefaultPointerTransform(displayTransform);
}
logOutboundMotionDetails("cancel - ", motionEntry);
@@ -4378,7 +4378,7 @@
targets.emplace_back(connection, targetFlags);
const ui::Transform displayTransform =
mWindowInfos.getDisplayTransform(motionEntry.displayId);
- targets.back().displayTransform = displayTransform;
+ targets.back().rawTransform = displayTransform;
targets.back().setDefaultPointerTransform(displayTransform);
}
logOutboundMotionDetails("down - ", motionEntry);
diff --git a/services/inputflinger/dispatcher/InputTarget.h b/services/inputflinger/dispatcher/InputTarget.h
index 90374f1..76f3fe0 100644
--- a/services/inputflinger/dispatcher/InputTarget.h
+++ b/services/inputflinger/dispatcher/InputTarget.h
@@ -77,8 +77,8 @@
// (ignored for KeyEvents)
float globalScaleFactor = 1.0f;
- // Current display transform. Used for compatibility for raw coordinates.
- ui::Transform displayTransform;
+ // The raw coordinate transform that's used for compatibility for MotionEvent's getRaw APIs.
+ ui::Transform rawTransform;
// Event time for the first motion event (ACTION_DOWN) dispatched to this input target if
// FLAG_SPLIT is set.