summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-06-09 20:40:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-09 20:40:48 +0000
commit558f55c79874990cb629a02fd015eec445a20e44 (patch)
tree63117702c199afba20357337ebc0981f5534da8c
parent837b9fb87b0a8ea8a4ca680952b86e4d759723d0 (diff)
parent5ab3ba1e43e609c7a77cc780c888f666d153a4c9 (diff)
am 5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '5ab3ba1e43e609c7a77cc780c888f666d153a4c9': SF: Don't crop surface damage against viewport
-rw-r--r--services/surfaceflinger/Layer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 8d8af522f6..e2a0167ee6 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -557,9 +557,7 @@ void Layer::setPerFrameData(const sp<const DisplayDevice>& hw,
surfaceDamageRegion.getBounds() == Rect::INVALID_RECT) {
layer.setSurfaceDamage(surfaceDamageRegion);
} else {
- Region surfaceDamage =
- tr.transform(surfaceDamageRegion.intersect(hw->getViewport()));
- layer.setSurfaceDamage(surfaceDamage);
+ layer.setSurfaceDamage(tr.transform(surfaceDamageRegion));
}
if (mSidebandStream.get()) {