diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-24 16:28:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 16:28:57 -0700 |
| commit | bc4389edfbb5777aec1a9af7863b2ca3ade2fa64 (patch) | |
| tree | 0f2f042bec24880c59c2b03246a1909c4185db8f /services/surfaceflinger/Layer.cpp | |
| parent | 67ca90b339feb8bb6889ca289a9dbc82c447b0d2 (diff) | |
| parent | 8395b4625b96f2133e2e4f595fdc69fbe222e4fc (diff) | |
| download | frameworks_base-bc4389edfbb5777aec1a9af7863b2ca3ade2fa64.zip frameworks_base-bc4389edfbb5777aec1a9af7863b2ca3ade2fa64.tar.gz frameworks_base-bc4389edfbb5777aec1a9af7863b2ca3ade2fa64.tar.bz2 | |
am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc' into gingerbread-plus-aosp
* commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc':
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 629d993..6f3c66d 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -473,9 +473,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() ); @@ -511,6 +511,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 |