cc: Changed total_pixels_rasterized to be a return value

cc/resources/picture_pile_impl.cc

 // Copyright 2012 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 "base/debug/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/rendering_stats.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/analysis_canvas.h"
@@ skipping 53 matching lines @@
 
 PicturePileImpl::~PicturePileImpl() {
 }
 
 PicturePileImpl* PicturePileImpl::GetCloneForDrawingOnThread(
     unsigned thread_index) const {
   CHECK_GT(clones_for_drawing_.clones_.size(), thread_index);
   return clones_for_drawing_.clones_[thread_index];
 }
 
-void PicturePileImpl::Raster(
+int64 PicturePileImpl::Raster(
     SkCanvas* canvas,
     gfx::Rect canvas_rect,
-    float contents_scale,
-    int64* total_pixels_rasterized) {
+    float contents_scale) {
 
   DCHECK(contents_scale >= min_contents_scale_);
 
 #ifndef NDEBUG
   // Any non-painted areas will be left in this color.
   canvas->clear(DebugColors::NonPaintedFillColor());
 #endif  // NDEBUG
 
   canvas->save();
   canvas->translate(-canvas_rect.x(), -canvas_rect.y());
@@ skipping 24 matching lines @@
     canvas->drawColor(background_color_, SkXfermode::kSrc_Mode);
   }
 
   // Rasterize the collection of relevant picture piles.
   gfx::Rect layer_rect = gfx::ToEnclosingRect(
       gfx::ScaleRect(content_rect, 1.f / contents_scale));
 
   canvas->clipRect(gfx::RectToSkRect(content_rect),
                    SkRegion::kReplace_Op);
   Region unclipped(content_rect);
+
+  int64 total_pixels_rasterized = 0;
   for (TilingData::Iterator tile_iter(&tiling_, layer_rect);
        tile_iter; ++tile_iter) {
     PictureListMap::iterator map_iter =
         picture_list_map_.find(tile_iter.index());
     if (map_iter == picture_list_map_.end())
       continue;
     PictureList& pic_list= map_iter->second;
     if (pic_list.empty())
       continue;
 
@@ skipping 18 matching lines @@
       } else {
         (*i)->Raster(canvas, content_clip, contents_scale, enable_lcd_text_);
       }
 
       // Don't allow pictures underneath to draw where this picture did.
       canvas->clipRect(
           gfx::RectToSkRect(content_clip),
           SkRegion::kDifference_Op);
       unclipped.Subtract(content_clip);
 
-      *total_pixels_rasterized +=
+      total_pixels_rasterized +=
           content_clip.width() * content_clip.height();
     }
   }
 
 #ifndef NDEBUG
   // Fill the remaining clip with debug color. This allows us to
   // distinguish between non painted areas and problems with missing
   // pictures.
   SkPaint paint;
   paint.setColor(DebugColors::MissingPictureFillColor());
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   canvas->drawPaint(paint);
 #endif  // NDEBUG
 
   // We should always paint some part of |content_rect|.
   DCHECK(!unclipped.Contains(content_rect));
 
   canvas->restore();
+
+  return total_pixels_rasterized;
 }
 
 void PicturePileImpl::GatherPixelRefs(
     gfx::Rect content_rect,
     float contents_scale,
     std::list<skia::LazyPixelRef*>& pixel_refs) {
   std::list<skia::LazyPixelRef*> result;
 
   gfx::Rect layer_rect = gfx::ToEnclosingRect(
       gfx::ScaleRect(content_rect, 1.f / contents_scale));
@@ skipping 20 matching lines @@
   gfx::Rect layer_rect(tiling_.total_size());
   skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture);
   if (layer_rect.IsEmpty())
     return picture;
 
   SkCanvas* canvas = picture->beginRecording(
       layer_rect.width(),
       layer_rect.height(),
       SkPicture::kUsePathBoundsForClip_RecordingFlag);
 
-  int64 total_pixels_rasterized = 0;
-  Raster(canvas, layer_rect, 1.0, &total_pixels_rasterized);
+  Raster(canvas, layer_rect, 1.0);
   picture->endRecording();
 
   return picture;
 }
 
 void PicturePileImpl::AnalyzeInRect(const gfx::Rect& content_rect,
                                     float contents_scale,
                                     PicturePileImpl::Analysis* analysis) {
   DCHECK(analysis);
   TRACE_EVENT0("cc", "PicturePileImpl::AnalyzeInRect");
 
   gfx::Rect layer_rect = gfx::ToEnclosingRect(
       gfx::ScaleRect(content_rect, 1.f / contents_scale));
 
   SkBitmap empty_bitmap;
   empty_bitmap.setConfig(SkBitmap::kNo_Config, content_rect.width(),
                         content_rect.height());
   skia::AnalysisDevice device(empty_bitmap);
   skia::AnalysisCanvas canvas(&device);
 
-  int64 total_pixels_rasterized = 0;
-  Raster(&canvas, content_rect, contents_scale, &total_pixels_rasterized);
+  Raster(&canvas, content_rect, contents_scale);
 
   analysis->is_transparent = canvas.isTransparent();
   analysis->is_solid_color = canvas.getColorIfSolid(&analysis->solid_color);
   analysis->is_cheap_to_raster = canvas.isCheap();
   canvas.consumeLazyPixelRefs(&analysis->lazy_pixel_refs);
 }
 
 PicturePileImpl::Analysis::Analysis() :
     is_solid_color(false),
     is_transparent(false),
     is_cheap_to_raster(false) {
 }
 
 PicturePileImpl::Analysis::~Analysis() {
 }
 
 }  // namespace cc