cc: Renamed approximate{BytesUsed,OpCount} in paint op buffer.

cc/paint/paint_op_buffer.h

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_PAINT_PAINT_OP_BUFFER_H_
 #define CC_PAINT_PAINT_OP_BUFFER_H_
 
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 762 matching lines @@
 
   PaintOpBuffer();
   explicit PaintOpBuffer(const SkRect& cull_rect);
   ~PaintOpBuffer() override;
 
   void Reset();
 
   void playback(SkCanvas* canvas) const;
   void playback(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
 
-  // TODO(enne): These are no longer approximate.  Rename these.
-  int approximateOpCount() const { return op_count_; }
-  size_t approximateBytesUsed() const {
+  // Returns the size of the paint op buffer. That is, the number of ops
+  // contained in it.
+  size_t size() const { return op_count_; }
+  // Returns the number of bytes used by the paint op buffer.
+  size_t bytes_used() const {
     return sizeof(*this) + reserved_ + subrecord_bytes_used_;
   }
   int numSlowPaths() const { return num_slow_paths_; }
   bool HasDiscardableImages() const { return has_discardable_images_; }
 
   // Resize the PaintOpBuffer to exactly fit the current amount of used space.
   void ShrinkToFit();
 
   const SkRect& cullRect() const { return cull_rect_; }
 
@@ skipping 70 matching lines @@
     explicit Iterator(const PaintOpBuffer* buffer)
         : buffer_(buffer), ptr_(buffer_->data_.get()) {}
 
     PaintOp* operator->() const {
       return op_idx_ ? reinterpret_cast<PaintOp*>(ptr_) : buffer_->GetFirstOp();
     }
     PaintOp* operator*() const { return operator->(); }
     Iterator begin() { return Iterator(buffer_, buffer_->data_.get(), 0); }
     Iterator end() {
       return Iterator(buffer_, buffer_->data_.get() + buffer_->used_,
-                      buffer_->approximateOpCount());
+                      buffer_->size());
     }
     bool operator!=(const Iterator& other) {
       // Not valid to compare iterators on different buffers.
       DCHECK_EQ(other.buffer_, buffer_);
       return other.op_idx_ != op_idx_;
     }
     Iterator& operator++() {
       if (!op_idx_++)
         return *this;
       PaintOp* op = **this;
       uint32_t type = op->type;
       CHECK_LE(type, static_cast<uint32_t>(PaintOpType::LastPaintOpType));
       ptr_ += op->skip;
       return *this;
     }
-    operator bool() const { return op_idx_ < buffer_->approximateOpCount(); }
+    operator bool() const { return op_idx_ < buffer_->size(); }
 
-    int op_idx() const { return op_idx_; }
+    size_t op_idx() const { return op_idx_; }
 
     // Return the next op without advancing the iterator, or nullptr if none.
     PaintOp* peek1() const {
-      if (op_idx_ + 1 >= buffer_->approximateOpCount())
+      if (op_idx_ + 1 >= buffer_->size())
         return nullptr;
       if (!op_idx_)
         return reinterpret_cast<PaintOp*>(ptr_);
       return reinterpret_cast<PaintOp*>(ptr_ + (*this)->skip);
     }
 
     // Return the op two ops ahead without advancing the iterator, or nullptr if
     // none.
     PaintOp* peek2() const {
-      if (op_idx_ + 2 >= buffer_->approximateOpCount())
+      if (op_idx_ + 2 >= buffer_->size())
         return nullptr;
       char* next = ptr_ + reinterpret_cast<PaintOp*>(ptr_)->skip;
       PaintOp* next_op = reinterpret_cast<PaintOp*>(next);
       if (!op_idx_)
         return next_op;
       return reinterpret_cast<PaintOp*>(next + next_op->skip);
     }
 
    private:
-    Iterator(const PaintOpBuffer* buffer, char* ptr, int op_idx)
+    Iterator(const PaintOpBuffer* buffer, char* ptr, size_t op_idx)
         : buffer_(buffer), ptr_(ptr), op_idx_(op_idx) {}
 
     const PaintOpBuffer* buffer_ = nullptr;
     char* ptr_ = nullptr;
-    int op_idx_ = 0;
+    size_t op_idx_ = 0;
   };
 
  private:
   void ReallocBuffer(size_t new_size);
   // Returns the allocated op and the number of bytes to skip in |data_| to get
   // to the next op.
   std::pair<void*, size_t> AllocatePaintOp(size_t sizeof_op, size_t bytes);
 
   template <typename T, typename... Args>
   T* push_internal(size_t bytes, Args&&... args) {
@@ skipping 20 matching lines @@
 
     subrecord_bytes_used_ += op->AdditionalBytesUsed();
   }
 
   // As a performance optimization because n=1 is an extremely common case just
   // store the first op in the PaintOpBuffer itself to avoid an extra alloc.
   base::AlignedMemory<sizeof(LargestPaintOp), PaintOpAlign> first_op_;
   std::unique_ptr<char, base::AlignedFreeDeleter> data_;
   size_t used_ = 0;
   size_t reserved_ = 0;
-  int op_count_ = 0;
+  size_t op_count_ = 0;
 
   // Record paths for veto-to-msaa for gpu raster.
   int num_slow_paths_ = 0;
   // Record additional bytes used by referenced sub-records and display lists.
   size_t subrecord_bytes_used_ = 0;
   bool has_discardable_images_ = false;
   SkRect cull_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(PaintOpBuffer);
 };
 
 }  // namespace cc
 
 #endif  // CC_PAINT_PAINT_OP_BUFFER_H_