summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/SurfaceFlinger.h
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-04 20:06:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-04 20:06:51 -0700
commitbba3b8efbe7dc9dd6fa326103ef7ddefc28d5ba5 (patch)
tree5da8b6283591ad47c1edca60a110fb3837a2459b /services/surfaceflinger/SurfaceFlinger.h
parent9fa7926beaf6c7fe32159a7e41fae9f618ec7504 (diff)
parent19058877df9bf94f197a72855f810f7f6bf8d068 (diff)
downloadframeworks_base-bba3b8efbe7dc9dd6fa326103ef7ddefc28d5ba5.zip
frameworks_base-bba3b8efbe7dc9dd6fa326103ef7ddefc28d5ba5.tar.gz
frameworks_base-bba3b8efbe7dc9dd6fa326103ef7ddefc28d5ba5.tar.bz2
am 19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp * commit '19058877df9bf94f197a72855f810f7f6bf8d068': refactored screenshot code
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index f09fdbc..f0a167b 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -197,7 +197,9 @@ public:
sp<IMemoryHeap>* heap,
uint32_t* width,
uint32_t* height,
- PixelFormat* format);
+ PixelFormat* format,
+ uint32_t reqWidth,
+ uint32_t reqHeight);
void screenReleased(DisplayID dpy);
void screenAcquired(DisplayID dpy);
@@ -318,6 +320,11 @@ private:
void commitTransaction();
+ status_t captureScreenImplLocked(DisplayID dpy,
+ sp<IMemoryHeap>* heap,
+ uint32_t* width, uint32_t* height, PixelFormat* format,
+ uint32_t reqWidth = 0, uint32_t reqHeight = 0);
+
friend class FreezeLock;
sp<FreezeLock> getFreezeLock() const;
inline void incFreezeCount() {