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