diff options
| author | Mathias Agopian <mathias@google.com> | 2013-04-24 10:25:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-24 10:25:34 +0000 |
| commit | bdcf1fe2ba4f6fe2eb63a5ec8246b1582b638e04 (patch) | |
| tree | c9ba7f0354eb4a99d3ae89943e9e68df4c2b4009 /include/gui | |
| parent | 1e5baa4e7dcc9610727103714343594240fe693d (diff) | |
| parent | 3e25fd8609b100a75721be82d1d499f0ae9083cb (diff) | |
| download | frameworks_native-bdcf1fe2ba4f6fe2eb63a5ec8246b1582b638e04.zip frameworks_native-bdcf1fe2ba4f6fe2eb63a5ec8246b1582b638e04.tar.gz frameworks_native-bdcf1fe2ba4f6fe2eb63a5ec8246b1582b638e04.tar.bz2 | |
Merge changes I0d9f18d1,Ib96c9161
* changes:
Add a --color option to dumpsys SurfaceFlinger
clean-up/simplify all dump() APIs
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/BufferQueue.h | 2 | ||||
| -rw-r--r-- | include/gui/ConsumerBase.h | 5 | ||||
| -rw-r--r-- | include/gui/GLConsumer.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h index 6c1b691..34264bf 100644 --- a/include/gui/BufferQueue.h +++ b/include/gui/BufferQueue.h @@ -229,7 +229,7 @@ public: // dump our state in a String virtual void dump(String8& result) const; - virtual void dump(String8& result, const char* prefix, char* buffer, size_t SIZE) const; + virtual void dump(String8& result, const char* prefix) const; // public facing structure for BufferSlot struct BufferItem { diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index 8a7545d..6250d8f 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -73,7 +73,7 @@ public: // their state to the dump by overriding the dumpLocked method, which is // called by these methods after locking the mutex. void dump(String8& result) const; - void dump(String8& result, const char* prefix, char* buffer, size_t SIZE) const; + void dump(String8& result, const char* prefix) const; // setFrameAvailableListener sets the listener object that will be notified // when a new frame becomes available. @@ -143,8 +143,7 @@ protected: // should call ConsumerBase::dumpLocked. // // This method must be called with mMutex locked. - virtual void dumpLocked(String8& result, const char* prefix, char* buffer, - size_t size) const; + virtual void dumpLocked(String8& result, const char* prefix) const; // acquireBufferLocked fetches the next buffer from the BufferQueue and // updates the buffer slot for the buffer returned. diff --git a/include/gui/GLConsumer.h b/include/gui/GLConsumer.h index f0a75dc..1e88927 100644 --- a/include/gui/GLConsumer.h +++ b/include/gui/GLConsumer.h @@ -233,8 +233,7 @@ protected: // dumpLocked overrides the ConsumerBase method to dump GLConsumer- // specific info in addition to the ConsumerBase behavior. - virtual void dumpLocked(String8& result, const char* prefix, char* buffer, - size_t size) const; + virtual void dumpLocked(String8& result, const char* prefix) const; // acquireBufferLocked overrides the ConsumerBase method to update the // mEglSlots array in addition to the ConsumerBase behavior. |