ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am fb992b77: am 6c925ede: Fixed discrepancy between crop and frame transparencies.

Browse Source 
* commit 'fb992b7753d73f4f18ef7aa1c8e3df5c09e6efbd':
  Fixed discrepancy between crop and frame transparencies.
This commit is contained in:
Michael Lentine 2014-10-03 21:10:48 +00:00 committed by Android Git Automerger
commit 50160cedf6
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
services/surfaceflinger/Layer.cpp
View File

@ -277,13 +277,18 @@ static Rect reduce(const Rect& win, const Region& exclude) {
} }
Rect Layer::computeBounds() const { Rect Layer::computeBounds() const {
const Layer::State& s(getDrawingState());
return computeBounds(s.activeTransparentRegion);
}
Rect Layer::computeBounds(const Region& activeTransparentRegion) const {
const Layer::State& s(getDrawingState()); const Layer::State& s(getDrawingState());
Rect win(s.active.w, s.active.h); Rect win(s.active.w, s.active.h);
if (!s.active.crop.isEmpty()) { if (!s.active.crop.isEmpty()) {
win.intersect(s.active.crop, &win); win.intersect(s.active.crop, &win);
} }
// subtract the transparent region and snap to the bounds // subtract the transparent region and snap to the bounds
return reduce(win, s.activeTransparentRegion); return reduce(win, activeTransparentRegion);
} }
FloatRect Layer::computeCrop(const sp<const DisplayDevice>& hw) const { FloatRect Layer::computeCrop(const sp<const DisplayDevice>& hw) const {
@ -405,7 +410,22 @@ void Layer::setGeometry(
// apply the layer's transform, followed by the display's global transform // apply the layer's transform, followed by the display's global transform
// here we're guaranteed that the layer's transform preserves rects // here we're guaranteed that the layer's transform preserves rects
Rect frame(s.transform.transform(computeBounds())); Region activeTransparentRegion(s.activeTransparentRegion);
if (!s.active.crop.isEmpty()) {
Rect activeCrop(s.active.crop);
activeCrop = s.transform.transform(activeCrop);
activeCrop.intersect(hw->getViewport(), &activeCrop);
activeCrop = s.transform.inverse().transform(activeCrop);
// mark regions outside the crop as transparent
activeTransparentRegion.orSelf(Rect(0, 0, s.active.w, activeCrop.top));
activeTransparentRegion.orSelf(Rect(0, activeCrop.bottom,
s.active.w, s.active.h));
activeTransparentRegion.orSelf(Rect(0, activeCrop.top,
activeCrop.left, activeCrop.bottom));
activeTransparentRegion.orSelf(Rect(activeCrop.right, activeCrop.top,
s.active.w, activeCrop.bottom));
}
Rect frame(s.transform.transform(computeBounds(activeTransparentRegion)));
frame.intersect(hw->getViewport(), &frame); frame.intersect(hw->getViewport(), &frame);
const Transform& tr(hw->getTransform()); const Transform& tr(hw->getTransform());
layer.setFrame(tr.transform(frame)); layer.setFrame(tr.transform(frame));

1
services/surfaceflinger/Layer.h
View File

@ -142,6 +142,7 @@ public:
void computeGeometry(const sp<const DisplayDevice>& hw, Mesh& mesh, void computeGeometry(const sp<const DisplayDevice>& hw, Mesh& mesh,
bool useIdentityTransform) const; bool useIdentityTransform) const;
Rect computeBounds(const Region& activeTransparentRegion) const;
Rect computeBounds() const; Rect computeBounds() const;
sp<IBinder> getHandle(); sp<IBinder> getHandle();