summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-08-12 17:13:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-12 17:13:01 -0700
commit7b53848d14dc041f6bc64c6fa5c63b93a87010aa (patch)
tree963bdd4242ca11930b0dc6772278eed8f72b2df1 /services
parent65de903a88d432044bfa78271dd3192856ff25b4 (diff)
parentb290b5e3cb0d3c5696279f8dd7f29a71fd7065da (diff)
downloadframeworks_base-7b53848d14dc041f6bc64c6fa5c63b93a87010aa.zip
frameworks_base-7b53848d14dc041f6bc64c6fa5c63b93a87010aa.tar.gz
frameworks_base-7b53848d14dc041f6bc64c6fa5c63b93a87010aa.tar.bz2
Merge "fix an orientation change drawing artifact."
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/Layer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 55b354d..0425fc3 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -191,14 +191,13 @@ void Layer::setGeometry(hwc_layer_t* hwcl)
* 1) buffer orientation/flip/mirror
* 2) state transformation (window manager)
* 3) layer orientation (screen orientation)
+ * mOrientation is already the composition of (2) and (3)
* (NOTE: the matrices are multiplied in reverse order)
*/
const Transform bufferOrientation(mCurrentTransform);
- const Transform& stateTransform(s.transform);
const Transform layerOrientation(mOrientation);
-
- const Transform tr(layerOrientation * stateTransform * bufferOrientation);
+ const Transform tr(layerOrientation * bufferOrientation);
// this gives us only the "orientation" component of the transform
const uint32_t finalTransform = tr.getOrientation();