CL for readability review

BUG=NONE
TEST=NONE

Review URL: https://chromiumcodereview.appspot.com/10541128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146835 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 38 insertions, 34 deletions

diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index b72aeb5..a77b3ae 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -35,17 +35,17 @@ class SourceBufferRange {
   // Appends |buffers| to the end of the range and updates |keyframe_map_| as
   // it encounters new keyframes. Assumes |buffers| belongs at the end of the
   // range.
-  void AppendToEnd(const BufferQueue& buffers);
-  bool CanAppendToEnd(const BufferQueue& buffers) const;
+  void AppendBuffersToEnd(const BufferQueue& buffers);
+  bool CanAppendBuffersToEnd(const BufferQueue& buffers) const;
 
   // Appends the buffers from |range| into this range.
   // The first buffer in |range| must come directly after the last buffer
   // in this range.
   // If |transfer_current_position| is true, |range|'s |next_buffer_index_|
   // is transfered to this SourceBufferRange.
-  void AppendToEnd(const SourceBufferRange& range,
-                   bool transfer_current_position);
-  bool CanAppendToEnd(const SourceBufferRange& range) const;
+  void AppendRangeToEnd(const SourceBufferRange& range,
+                        bool transfer_current_position);
+  bool CanAppendRangeToEnd(const SourceBufferRange& range) const;
 
   // Updates |next_buffer_index_| to point to the Buffer containing |timestamp|.
   // Assumes |timestamp| is valid and in this range.
@@ -436,8 +436,8 @@ void SourceBufferStream::InsertIntoExistingRange(
 
   // If this is a simple case where we can just append to the end of the range,
   // do so and return.
-  if (range_for_new_buffers->CanAppendToEnd(new_buffers)) {
-    range_for_new_buffers->AppendToEnd(new_buffers);
+  if (range_for_new_buffers->CanAppendBuffersToEnd(new_buffers)) {
+    range_for_new_buffers->AppendBuffersToEnd(new_buffers);
     return;
   }
 
@@ -457,7 +457,7 @@ void SourceBufferStream::InsertIntoExistingRange(
   BufferQueue saved_buffers;
   bool deleted_next_buffer_from_range =
       range_for_new_buffers->TruncateAt(new_buffers.front(), &saved_buffers);
-  range_for_new_buffers->AppendToEnd(new_buffers);
+  range_for_new_buffers->AppendBuffersToEnd(new_buffers);
 
   if (selected_range_ != range_for_new_buffers)
     return;
@@ -484,7 +484,7 @@ void SourceBufferStream::ResolveCompleteOverlaps(
 
   SourceBufferRange* range_with_new_buffers = *range_with_new_buffers_itr;
   RangeList::iterator next_range_itr = range_with_new_buffers_itr;
-  next_range_itr++;
+  ++next_range_itr;
 
   while (next_range_itr != ranges_.end() &&
          range_with_new_buffers->CompletelyOverlaps(**next_range_itr)) {
@@ -507,7 +507,7 @@ void SourceBufferStream::ResolveEndOverlap(
 
   SourceBufferRange* range_with_new_buffers = *range_with_new_buffers_itr;
   RangeList::iterator next_range_itr = range_with_new_buffers_itr;
-  next_range_itr++;
+  ++next_range_itr;
 
   if (next_range_itr == ranges_.end() ||
       !range_with_new_buffers->EndOverlaps(**next_range_itr)) {
@@ -604,13 +604,13 @@ void SourceBufferStream::MergeWithAdjacentRangeIfNecessary(
     const RangeList::iterator& range_with_new_buffers_itr) {
   SourceBufferRange* range_with_new_buffers = *range_with_new_buffers_itr;
   RangeList::iterator next_range_itr = range_with_new_buffers_itr;
-  next_range_itr++;
+  ++next_range_itr;
 
   if (next_range_itr != ranges_.end() &&
-      range_with_new_buffers->CanAppendToEnd(**next_range_itr)) {
+      range_with_new_buffers->CanAppendRangeToEnd(**next_range_itr)) {
     bool transfer_current_position = selected_range_ == *next_range_itr;
-    range_with_new_buffers->AppendToEnd(**next_range_itr,
-                                        transfer_current_position);
+    range_with_new_buffers->AppendRangeToEnd(**next_range_itr,
+                                             transfer_current_position);
     // Update |selected_range_| pointer if |range| has become selected after
     // merges.
     if (transfer_current_position)
@@ -690,7 +690,7 @@ base::TimeDelta SourceBufferStream::GetEndBufferTimestamp() {
 
 SourceBufferStream::RangeList::iterator
 SourceBufferStream::FindExistingRangeFor(base::TimeDelta start_timestamp) {
-  for (RangeList::iterator itr = ranges_.begin(); itr != ranges_.end(); itr++) {
+  for (RangeList::iterator itr = ranges_.begin(); itr != ranges_.end(); ++itr) {
     if ((*itr)->BelongsToRange(start_timestamp))
       return itr;
   }
@@ -701,7 +701,7 @@ SourceBufferStream::RangeList::iterator
 SourceBufferStream::AddToRanges(SourceBufferRange* new_range) {
   base::TimeDelta start_timestamp = new_range->GetStartTimestamp();
   RangeList::iterator itr = ranges_.end();
-  for (itr = ranges_.begin(); itr != ranges_.end(); itr++) {
+  for (itr = ranges_.begin(); itr != ranges_.end(); ++itr) {
     if ((*itr)->GetStartTimestamp() > start_timestamp)
       break;
   }
@@ -712,7 +712,7 @@ SourceBufferStream::RangeList::iterator
 SourceBufferStream::GetSelectedRangeItr() {
   DCHECK(selected_range_);
   RangeList::iterator itr = ranges_.end();
-  for (itr = ranges_.begin(); itr != ranges_.end(); itr++) {
+  for (itr = ranges_.begin(); itr != ranges_.end(); ++itr) {
     if (*itr == selected_range_)
       break;
   }
@@ -729,7 +729,7 @@ void SourceBufferStream::SetSelectedRange(SourceBufferRange* range) {
 Ranges<base::TimeDelta> SourceBufferStream::GetBufferedTime() const {
   Ranges<base::TimeDelta> ranges;
   for (RangeList::const_iterator itr = ranges_.begin();
-       itr != ranges_.end(); itr++) {
+       itr != ranges_.end(); ++itr) {
     ranges.Add((*itr)->GetStartTimestamp(), (*itr)->GetBufferedEndTimestamp());
   }
   return ranges;
@@ -761,12 +761,12 @@ SourceBufferRange::SourceBufferRange(
   DCHECK(!new_buffers.empty());
   DCHECK(new_buffers.front()->IsKeyframe());
   DCHECK(!interbuffer_distance_cb.is_null());
-  AppendToEnd(new_buffers);
+  AppendBuffersToEnd(new_buffers);
 }
 
-void SourceBufferRange::AppendToEnd(const BufferQueue& new_buffers) {
+void SourceBufferRange::AppendBuffersToEnd(const BufferQueue& new_buffers) {
   for (BufferQueue::const_iterator itr = new_buffers.begin();
-       itr != new_buffers.end(); itr++) {
+       itr != new_buffers.end(); ++itr) {
     DCHECK((*itr)->GetDecodeTimestamp() != kNoTimestamp());
     buffers_.push_back(*itr);
     if ((*itr)->IsKeyframe()) {
@@ -953,7 +953,7 @@ bool SourceBufferRange::GetNextBuffer(
 
 bool SourceBufferRange::HasNextBuffer() const {
   return next_buffer_index_ >= 0 &&
-         next_buffer_index_ < static_cast<int>(buffers_.size());
+      next_buffer_index_ < static_cast<int>(buffers_.size());
 }
 
 base::TimeDelta SourceBufferRange::GetNextTimestamp() const {
@@ -979,22 +979,24 @@ void SourceBufferRange::ResetNextBufferPosition() {
   next_keyframe_timestamp_ = kNoTimestamp();
 }
 
-void SourceBufferRange::AppendToEnd(const SourceBufferRange& range,
-                                    bool transfer_current_position) {
-  DCHECK(CanAppendToEnd(range));
+void SourceBufferRange::AppendRangeToEnd(const SourceBufferRange& range,
+                                         bool transfer_current_position) {
+  DCHECK(CanAppendRangeToEnd(range));
   DCHECK(!buffers_.empty());
 
   if (transfer_current_position)
     next_buffer_index_ = range.next_buffer_index_ + buffers_.size();
 
-  AppendToEnd(range.buffers_);
+  AppendBuffersToEnd(range.buffers_);
 }
 
-bool SourceBufferRange::CanAppendToEnd(const SourceBufferRange& range) const {
-  return CanAppendToEnd(range.buffers_);
+bool SourceBufferRange::CanAppendRangeToEnd(
+    const SourceBufferRange& range) const {
+  return CanAppendBuffersToEnd(range.buffers_);
 }
 
-bool SourceBufferRange::CanAppendToEnd(const BufferQueue& buffers) const {
+bool SourceBufferRange::CanAppendBuffersToEnd(
+    const BufferQueue& buffers) const {
   DCHECK(!buffers_.empty());
   return IsNextInSequence(buffers_.back(),
                           buffers.front()->GetDecodeTimestamp());
diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h
index a0151ea..003a512 100644
--- a/media/filters/source_buffer_stream.h
+++ b/media/filters/source_buffer_stream.h
@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// SourceBufferStream is a data structure that stores media Buffers in ranges.
+// Buffers can be appended out of presentation order. Buffers are retrieved by
+// seeking to the desired start point and calling GetNextBuffer(). Buffers are
+// returned in sequential presentation order.
+
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
 #define MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
 
@@ -20,10 +25,7 @@ namespace media {
 
 class SourceBufferRange;
 
-// SourceBufferStream is a data structure that stores media Buffers in ranges.
-// Buffers can be appended out of presentation order. Buffers are retrieved by
-// seeking to the desired start point and calling GetNextBuffer(). Buffers are
-// returned in sequential presentation order.
+// See file-level comment for complete description.
 class MEDIA_EXPORT SourceBufferStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc
index 95a81ff..310af01 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -123,7 +123,7 @@ class SourceBufferStreamTest : public testing::Test {
 
       if (expected_data) {
         const uint8* actual_data = buffer->GetData();
-        const int  actual_size = buffer->GetDataSize();
+        const int actual_size = buffer->GetDataSize();
         EXPECT_EQ(expected_size, actual_size);
         for (int i = 0; i < std::min(actual_size, expected_size); i++) {
           EXPECT_EQ(expected_data[i], actual_data[i]);