summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-06-26 19:37:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-26 19:37:29 +0000
commitf413de05cfb9a1b84b73c8e6c306d4142130c5f7 (patch)
tree5228df1bf11368d3dab37dc5de0800c78d0860e6 /services
parente74f1557c7030a6c988d8e4cd940c933c4237ac8 (diff)
parentdb4850c01ff02bf7f936aa427e1fa8af9abc8f22 (diff)
downloadframeworks_native-f413de05cfb9a1b84b73c8e6c306d4142130c5f7.zip
frameworks_native-f413de05cfb9a1b84b73c8e6c306d4142130c5f7.tar.gz
frameworks_native-f413de05cfb9a1b84b73c8e6c306d4142130c5f7.tar.bz2
Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/Layer.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 39b80ec..91f80b6 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -551,14 +551,7 @@ void Layer::setPerFrameData(const sp<const DisplayDevice>& hw,
const Transform& tr = hw->getTransform();
Region visible = tr.transform(visibleRegion.intersect(hw->getViewport()));
layer.setVisibleRegionScreen(visible);
-
- // Pass full-surface damage down untouched
- if (surfaceDamageRegion.isRect() &&
- surfaceDamageRegion.getBounds() == Rect::INVALID_RECT) {
- layer.setSurfaceDamage(surfaceDamageRegion);
- } else {
- layer.setSurfaceDamage(tr.transform(surfaceDamageRegion));
- }
+ layer.setSurfaceDamage(surfaceDamageRegion);
if (mSidebandStream.get()) {
layer.setSidebandStream(mSidebandStream);