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

cc/paint/display_item_list.h

 // Copyright 2014 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_DISPLAY_ITEM_LIST_H_
 #define CC_PAINT_DISPLAY_ITEM_LIST_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 112 matching lines @@
 
   // Called after all items are appended, to process the items and, if
   // applicable, create an internally cached SkPicture.
   void Finalize();
 
   void SetIsSuitableForGpuRasterization(bool is_suitable) {
     all_items_are_suitable_for_gpu_rasterization_ = is_suitable;
   }
   bool IsSuitableForGpuRasterization() const;
 
-  int ApproximateOpCount() const;
+  size_t OpCount() const;
   size_t ApproximateMemoryUsage() const;
   bool ShouldBeAnalyzedForSolidColor() const;
 
   void EmitTraceSnapshot() const;
 
   void GenerateDiscardableImagesMetadata();
   void GetDiscardableImagesInRect(const gfx::Rect& rect,
                                   float contents_scale,
                                   const gfx::ColorSpace& target_color_space,
                                   std::vector<DrawImage>* images);
@@ skipping 32 matching lines @@
       bool include_items) const;
 
   // If we're currently within a paired display item block, unions the
   // given visual rect with the begin display item's visual rect.
   void GrowCurrentBeginItemVisualRect(const gfx::Rect& visual_rect);
 
   template <typename DisplayItemType, typename... Args>
   const DisplayItemType& AllocateAndConstruct(Args&&... args) {
     auto* item = &items_.AllocateAndConstruct<DisplayItemType>(
         std::forward<Args>(args)...);
-    approximate_op_count_ += item->ApproximateOpCount();
+    op_count_ += item->OpCount();
     return *item;
   }
 
   RTree rtree_;
   DiscardableImageMap image_map_;
   ContiguousContainer<DisplayItem> items_;
 
   // The visual rects associated with each of the display items in the
   // display item list. There is one rect per display item, and the
   // position in |visual_rects| matches the position of the item in
   // |items| . These rects are intentionally kept separate
   // because they are not needed while walking the |items| for raster.
   std::vector<gfx::Rect> visual_rects_;
   std::vector<size_t> begin_item_indices_;
 
-  int approximate_op_count_ = 0;
+  size_t op_count_ = 0u;
   bool all_items_are_suitable_for_gpu_rasterization_ = true;
   // For testing purposes only. Whether to keep visual rects across calls to
   // Finalize().
   bool retain_visual_rects_ = false;
   bool has_discardable_images_ = false;
 
   friend class base::RefCountedThreadSafe<DisplayItemList>;
   FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
   DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
 };
 
 }  // namespace cc
 
 #endif  // CC_PAINT_DISPLAY_ITEM_LIST_H_