| Index: cc/paint/display_item_list.cc
|
| diff --git a/cc/paint/display_item_list.cc b/cc/paint/display_item_list.cc
|
| index 5f6fae6f334358a30d0fc05eb4c04eda7f1aab05..e656f60d4cb3f535c27842f3505002c2d64bb115 100644
|
| --- a/cc/paint/display_item_list.cc
|
| +++ b/cc/paint/display_item_list.cc
|
| @@ -179,7 +179,7 @@ static bool MergeAndDrawIfPossible(const CompositingDisplayItem& save_item,
|
| // 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();
|
| @@ -255,8 +255,8 @@ bool DisplayItemList::IsSuitableForGpuRasterization() const {
|
| 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 {
|
| @@ -315,7 +315,7 @@ size_t DisplayItemList::ApproximateMemoryUsage() const {
|
| }
|
|
|
| bool DisplayItemList::ShouldBeAnalyzedForSolidColor() const {
|
| - return ApproximateOpCount() <= kOpCountThatIsOkToAnalyze;
|
| + return OpCount() <= kOpCountThatIsOkToAnalyze;
|
| }
|
|
|
| void DisplayItemList::EmitTraceSnapshot() const {
|
|
|