summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-06-26 20:01:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 20:01:09 +0000
commit488986f4ad7a92b04fdfd761ae07785019d2a9d3 (patch)
treedc1b6977a320a21fa0d3219cab5cfce4ed2f56e9 /services
parent3875698f8d47af86e024817889e4107392d20439 (diff)
parentf413de05cfb9a1b84b73c8e6c306d4142130c5f7 (diff)
downloadframeworks_native-488986f4ad7a92b04fdfd761ae07785019d2a9d3.zip
frameworks_native-488986f4ad7a92b04fdfd761ae07785019d2a9d3.tar.gz
frameworks_native-488986f4ad7a92b04fdfd761ae07785019d2a9d3.tar.bz2
am f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
* commit 'f413de05cfb9a1b84b73c8e6c306d4142130c5f7': libgui: Fix handling of rotated surface damage
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);