diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 01:30:04 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 01:30:04 +0000 |
| commit | 2da7b8ea8937b49475f39e383bbc7e452582a2e7 (patch) | |
| tree | 67e8ff30f3a4dc98b903e98d19ebf56da800331a /mojo | |
| parent | 3ad2398165694ba9243b7f9539d367ba3122f9ef (diff) | |
| download | chromium_src-2da7b8ea8937b49475f39e383bbc7e452582a2e7.zip chromium_src-2da7b8ea8937b49475f39e383bbc7e452582a2e7.tar.gz chromium_src-2da7b8ea8937b49475f39e383bbc7e452582a2e7.tar.bz2 | |
Mojo: Remove MessageInTransit::View's message_size_ member.
R=yzshen@chromium.org
Review URL: https://codereview.chromium.org/183513009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/system/message_in_transit.cc | 9 | ||||
| -rw-r--r-- | mojo/system/message_in_transit.h | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mojo/system/message_in_transit.cc b/mojo/system/message_in_transit.cc index 5b6236b..a444a8e 100644 --- a/mojo/system/message_in_transit.cc +++ b/mojo/system/message_in_transit.cc @@ -48,12 +48,13 @@ STATIC_CONST_MEMBER_DEFINITION const size_t MessageInTransit::kMessageAlignment; MessageInTransit::View::View(size_t message_size, const void* buffer) - : message_size_(message_size), - buffer_(buffer) { + : buffer_(buffer) { size_t next_message_size = 0; - DCHECK(MessageInTransit::GetNextMessageSize(buffer_, message_size_, + DCHECK(MessageInTransit::GetNextMessageSize(buffer_, message_size, &next_message_size)); - DCHECK_EQ(message_size_, next_message_size); + DCHECK_EQ(message_size, next_message_size); + // This should be equivalent. + DCHECK_EQ(message_size, total_size()); } MessageInTransit::MessageInTransit(Type type, diff --git a/mojo/system/message_in_transit.h b/mojo/system/message_in_transit.h index d8eb07d..66f374d 100644 --- a/mojo/system/message_in_transit.h +++ b/mojo/system/message_in_transit.h @@ -83,11 +83,11 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransit { return RoundUpMessageAlignment(sizeof(Header) + header()->num_bytes); } const void* secondary_buffer() const { - return (message_size_ > main_buffer_size()) ? + return (total_size() > main_buffer_size()) ? static_cast<const char*>(buffer_) + main_buffer_size() : NULL; } size_t secondary_buffer_size() const { - return message_size_ - main_buffer_size(); + return total_size() - main_buffer_size(); } size_t total_size() const { return header()->total_size; } uint32_t num_bytes() const { return header()->num_bytes; } @@ -103,7 +103,6 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransit { private: const Header* header() const { return static_cast<const Header*>(buffer_); } - const size_t message_size_; const void* const buffer_; // Though this struct is trivial, disallow copy and assign, since it doesn't |