diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-24 17:56:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 17:56:40 -0700 |
| commit | bce2e90ca9bc2277a4816b7996f84506df411cf9 (patch) | |
| tree | 2a1902282acfebe7f68a202a4c43ffbeb0e9df6d /services/surfaceflinger/Layer.cpp | |
| parent | 8d9d751a8f09a0199d1d22a3f8267eb51f919cc0 (diff) | |
| parent | bc4389edfbb5777aec1a9af7863b2ca3ade2fa64 (diff) | |
| download | frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.zip frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.tar.gz frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.tar.bz2 | |
am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64'
* commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64':
fix [2931513] Add support for setting the orientation of an ANativeWindow
Diffstat (limited to 'services/surfaceflinger/Layer.cpp')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 3720e1669..212c08b 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -530,9 +530,9 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) return; } - // get the dirty region sp<GraphicBuffer> newFrontBuffer(getBuffer(buf)); if (newFrontBuffer != NULL) { + // get the dirty region // compute the posted region const Region dirty(lcblk->getDirtyRegion(buf)); mPostedDirtyRegion = dirty.intersect( newFrontBuffer->getBounds() ); @@ -568,6 +568,13 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) // we now have the correct size, unfreeze the screen mFreezeLock.clear(); } + + // get the crop region + setBufferCrop( lcblk->getCrop(buf) ); + + // get the transformation + setBufferTransform( lcblk->getTransform(buf) ); + } else { // this should not happen unless we ran out of memory while // allocating the buffer. we're hoping that things will get back |