diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/dbus/message.h | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/dbus/message.h')
-rw-r--r-- | chromium/dbus/message.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chromium/dbus/message.h b/chromium/dbus/message.h index 54ca036cceb..db3456acd0c 100644 --- a/chromium/dbus/message.h +++ b/chromium/dbus/message.h @@ -408,12 +408,14 @@ class CHROME_DBUS_EXPORT MessageReader { // Arrays of bytes are often used for exchanging binary blobs hence it's // worth having a specialized function. // - // |bytes| must be copied if the contents will be referenced after the - // MessageReader is destroyed. - bool PopArrayOfBytes(uint8** bytes, size_t* length); - - // Gets the array of strings at the current iterator position. - // Returns true and advances the iterator on success. + // Ownership of the memory pointed to by |bytes| remains with the + // MessageReader; |bytes| must be copied if the contents will be referenced + // after the MessageReader is destroyed. + bool PopArrayOfBytes(const uint8** bytes, size_t* length); + + // Gets the array of strings at the current iterator position. |strings| is + // cleared before being modified. Returns true and advances the iterator on + // success. // // Arrays of strings are often used to communicate with D-Bus // services like KWallet, hence it's worth having a specialized @@ -421,7 +423,8 @@ class CHROME_DBUS_EXPORT MessageReader { bool PopArrayOfStrings(std::vector<std::string>* strings); // Gets the array of object paths at the current iterator position. - // Returns true and advances the iterator on success. + // |object_paths| is cleared before being modified. Returns true and advances + // the iterator on success. // // Arrays of object paths are often used to communicate with D-Bus // services like NetworkManager, hence it's worth having a specialized |