diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-27 16:18:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 16:18:12 -0700 |
| commit | 54c4bf27437b8d7f8d2a494acd9de53d55696dea (patch) | |
| tree | 0045c300c5f2cbd1ddb2756a31f79b80fa7b0eb3 /include | |
| parent | 4dcea37d48cc25d5e5e5cc56f7ca3d90d4efd49d (diff) | |
| parent | d322d16323176ddd5fef3383798176f64d0078c8 (diff) | |
| download | frameworks_base-54c4bf27437b8d7f8d2a494acd9de53d55696dea.zip frameworks_base-54c4bf27437b8d7f8d2a494acd9de53d55696dea.tar.gz frameworks_base-54c4bf27437b8d7f8d2a494acd9de53d55696dea.tar.bz2 | |
am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread
Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'
* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
fix a race in SF buffer management
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/surfaceflinger/SharedBufferStack.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/private/surfaceflinger/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h index d016dfa..d689667 100644 --- a/include/private/surfaceflinger/SharedBufferStack.h +++ b/include/private/surfaceflinger/SharedBufferStack.h @@ -151,7 +151,6 @@ public: ~SharedBufferBase(); status_t getStatus() const; int32_t getIdentity() const; - size_t getFrontBuffer() const; String8 dump(char const* prefix) const; protected: @@ -226,6 +225,11 @@ private: inline ssize_t operator()(); }; + struct DequeueUpdate : public UpdateBase { + inline DequeueUpdate(SharedBufferBase* sbb); + inline ssize_t operator()(); + }; + struct UndoDequeueUpdate : public UpdateBase { inline UndoDequeueUpdate(SharedBufferBase* sbb); inline ssize_t operator()(); |