commit 5af281f4abb0401ebb4e614291a19780b71f236c
author Michael Lentine <mlentine@google.com> Thu Aug 07 13:40:48 2014 -0700
committer Michael Lentine <mlentine@google.com> Thu Aug 07 13:44:14 2014 -0700
tree b601ebde9360769714a05dfed82fb3a79c335ad3
parent 812e039aeb42c1a3c8bb8246c114f54115a335da

Fix HWComposer Surface Crop when surface is rotated

Bug: 15091149

Change-Id: I97ecd8af9636da9403fafdb3f9b846f95053ebb7

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index bbb5cfe..716d24e 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -332,16 +332,16 @@
             winHeight = s.active.w;
         }
         const Rect winCrop = activeCrop.transform(
-                invTransform, s.active.w, s.active.h);
+                invTransform, winWidth, winHeight);
 
         // below, crop is intersected with winCrop expressed in crop's coordinate space
         float xScale = crop.getWidth()  / float(winWidth);
         float yScale = crop.getHeight() / float(winHeight);
 
-        float insetL = winCrop.left                 * xScale;
-        float insetT = winCrop.top                  * yScale;
-        float insetR = (winWidth  - winCrop.right ) * xScale;
-        float insetB = (winHeight - winCrop.bottom) * yScale;
+        float insetL = winCrop.left                  * xScale;
+        float insetT = winCrop.top                   * yScale;
+        float insetR = (s.active.w - winCrop.right ) * xScale;
+        float insetB = (s.active.h - winCrop.bottom) * yScale;
 
         crop.left   += insetL;
         crop.top    += insetT;