cc: Combine analysis and raster

cc/test/skia_common.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 "cc/test/skia_common.h"
 
 #include "cc/resources/picture.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "ui/gfx/rect.h"
@@ skipping 51 matching lines @@
                  gfx::Rect layer_rect,
                  scoped_refptr<Picture> picture) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                    layer_rect.width(),
                    layer_rect.height());
   bitmap.setPixels(buffer);
   SkBitmapDevice device(bitmap);
   SkCanvas canvas(&device);
   canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  picture->Raster(&canvas, NULL, layer_rect, 1.0f);
+  picture->Raster(&canvas, layer_rect, 1.0f);
 }
 
 void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) {
   SkImageInfo info = {
     size.width(),
     size.height(),
     kPMColor_SkColorType,
     kPremul_SkAlphaType
   };
 
   skia::RefPtr<TestLazyPixelRef> lazy_pixel_ref =
       skia::AdoptRef(new TestLazyPixelRef(info));
   lazy_pixel_ref->setURI(uri);
 
   bitmap->setConfig(info);
   bitmap->setPixelRef(lazy_pixel_ref.get());
 }
 
 
 }  // namespace cc