commit 1b58c743e6748272e98cd04d3c0f63e371a44329
author Mathias Agopian <mathias@google.com> Wed Jul 28 16:30:56 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 28 16:30:56 2010 -0700
tree a5e8e6c7832300ea64389fa66a251f6ef39a1bcf
parent ff4a7fa411401910e6e5ac88aeb6e0080a8cc8b1
parent be1ad8d186d0db6e0a3c8885c95a354cbbfc52af

Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread

include/private/surfaceflinger/SharedBufferStack.h

diff --git a/include/private/surfaceflinger/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h
index 633b543..1eb178e 100644
--- a/include/private/surfaceflinger/SharedBufferStack.h
+++ b/include/private/surfaceflinger/SharedBufferStack.h
@@ -273,7 +273,6 @@
     void setStatus(status_t status);
     status_t reallocateAll();
     status_t reallocateAllExcept(int buffer);
-    status_t assertReallocate(int buffer);
     int32_t getQueuedCount() const;
     Region getDirtyRegion(int buffer) const;
 
@@ -356,13 +355,6 @@
         inline StatusUpdate(SharedBufferBase* sbb, status_t status);
         inline ssize_t operator()();
     };
-
-    struct ReallocateCondition : public ConditionBase {
-        int buf;
-        inline ReallocateCondition(SharedBufferBase* sbb, int buf);
-        inline bool operator()() const;
-        inline const char* name() const { return "ReallocateCondition"; }
-    };
 };
 
 // ===========================================================================