From 7b90258c7b1b6caf7fbbf62423723d0f4cdc79aa Mon Sep 17 00:00:00 2001 From: Michael Lentine Date: Tue, 19 Aug 2014 18:14:06 -0700 Subject: [PATCH] Fix inverse orientation when original is not applied first. Change-Id: I6f1a11950c77c99800acbf08a672bc1b2310b0b5 --- services/surfaceflinger/Layer.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 2bbb223fc..a36ddd958 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -348,8 +348,17 @@ FloatRect Layer::computeCrop(const sp& hw) const { int winWidth = s.active.w; int winHeight = s.active.h; if (invTransform & NATIVE_WINDOW_TRANSFORM_ROT_90) { - invTransform ^= NATIVE_WINDOW_TRANSFORM_FLIP_V | - NATIVE_WINDOW_TRANSFORM_FLIP_H; + // If the activeCrop has been rotate the ends are rotated but not + // the space itself so when transforming ends back we can't rely on + // a modification of the axes of rotation. To account for this we + // need to reorient the inverse rotation in terms of the current + // axes of rotation. + bool is_h_flipped = (invTransform & NATIVE_WINDOW_TRANSFORM_FLIP_H) != 0; + bool is_v_flipped = (invTransform & NATIVE_WINDOW_TRANSFORM_FLIP_V) != 0; + if (is_h_flipped == is_v_flipped) { + invTransform ^= NATIVE_WINDOW_TRANSFORM_FLIP_V | + NATIVE_WINDOW_TRANSFORM_FLIP_H; + } winWidth = s.active.h; winHeight = s.active.w; }