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

cc/paint/display_item_list.cc

 // 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.
 
 #include "cc/paint/display_item_list.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 161 matching lines @@
                                    const DrawingDisplayItem& draw_item,
                                    SkCanvas* canvas) {
   if (save_item.color_filter)
     return false;
   if (save_item.xfermode != SkBlendMode::kSrcOver)
     return false;
   // TODO(enne): I believe that lcd_text_requires_opaque_layer is not
   // relevant here and that lcd text is preserved post merge, but I haven't
   // tested that.
   const PaintRecord* record = draw_item.picture.get();
-  if (record->approximateOpCount() != 1)
+  if (record->size() != 1u)
     return false;
 
   const PaintOp* op = record->GetFirstOp();
   if (!op->IsDrawOp())
     return false;
 
   op->RasterWithAlpha(canvas, save_item.alpha);
   return true;
 }
 
@@ skipping 55 matching lines @@
 }
 
 bool DisplayItemList::IsSuitableForGpuRasterization() const {
   // TODO(wkorman): This is more permissive than Picture's implementation, since
   // none of the items might individually trigger a veto even though they
   // collectively have enough "bad" operations that a corresponding Picture
   // would get vetoed. See crbug.com/513016.
   return all_items_are_suitable_for_gpu_rasterization_;
 }
 
-int DisplayItemList::ApproximateOpCount() const {
-  return approximate_op_count_;
+size_t DisplayItemList::OpCount() const {
+  return op_count_;
 }
 
 size_t DisplayItemList::ApproximateMemoryUsage() const {
   size_t memory_usage = sizeof(*this);
 
   size_t external_memory_usage = 0;
   for (const auto& item : items_) {
     size_t bytes = 0;
     switch (item.type) {
       case DisplayItem::CLIP:
@@ skipping 38 matching lines @@
   memory_usage += items_.GetCapacityInBytes() + external_memory_usage;
 
   // TODO(jbroman): Does anything else owned by this class substantially
   // contribute to memory usage?
   // TODO(vmpstr): Probably DiscardableImageMap is worth counting here.
 
   return memory_usage;
 }
 
 bool DisplayItemList::ShouldBeAnalyzedForSolidColor() const {
-  return ApproximateOpCount() <= kOpCountThatIsOkToAnalyze;
+  return OpCount() <= kOpCountThatIsOkToAnalyze;
 }
 
 void DisplayItemList::EmitTraceSnapshot() const {
   bool include_items;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.display_items"), &include_items);
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.display_items") ","
       TRACE_DISABLED_BY_DEFAULT("cc.debug.picture") ","
       TRACE_DISABLED_BY_DEFAULT("devtools.timeline.picture"),
@@ skipping 211 matching lines @@
     std::vector<DrawImage>* images) {
   image_map_.GetDiscardableImagesInRect(rect, contents_scale,
                                         target_color_space, images);
 }
 
 gfx::Rect DisplayItemList::GetRectForImage(ImageId image_id) const {
   return image_map_.GetRectForImage(image_id);
 }
 
 }  // namespace cc