Switch Chromium to new Skia SkCanvas::drawPicture method

skia/ext/benchmarking_canvas.cc

 // Copyright (c) 2013 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/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "skia/ext/benchmarking_canvas.h"
 #include "third_party/skia/include/utils/SkProxyCanvas.h"
 
@@ skipping 96 matching lines @@
     AutoStamper stamper(this);
     SkProxyCanvas::drawBitmapMatrix(bitmap, m, paint);
   }
 
   virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
                           const SkPaint* paint = NULL) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::drawSprite(bitmap, left, top, paint);
   }
 
-  virtual void drawPicture(SkPicture& picture) OVERRIDE {
-    AutoStamper stamper(this);
-    SkProxyCanvas::drawPicture(picture);
-  }
-
   virtual void drawVertices(VertexMode vmode, int vertexCount,
                             const SkPoint vertices[], const SkPoint texs[],
                             const SkColor colors[], SkXfermode* xmode,
                             const uint16_t indices[], int indexCount,
                             const SkPaint& paint) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::drawVertices(vmode, vertexCount, vertices, texs, colors,
                                 xmode, indices, indexCount, paint);
   }
 
@@ skipping 47 matching lines @@
     AutoStamper stamper(this);
     SkProxyCanvas::onClipPath(path, op, edge_style);
   }
 
   virtual void onClipRegion(const SkRegion& region,
                             SkRegion::Op op) OVERRIDE {
     AutoStamper stamper(this);
     SkProxyCanvas::onClipRegion(region, op);
   }
 
+  virtual void onDrawPicture(const SkPicture* picture) OVERRIDE {
+    AutoStamper stamper(this);
+    SkProxyCanvas::onDrawPicture(picture);
+  }
+
 private:
   typedef base::hash_map<size_t, base::TimeDelta> TimingsMap;
   TimingsMap timings_map_;
 
   skia::RefPtr<SkCanvas> canvas_;
 
   friend class AutoStamper;
   const BenchmarkingCanvas* tracking_canvas_;
 };
 
@@ skipping 30 matching lines @@
   DCHECK_LT(index, static_cast<size_t>(debug_canvas_->getSize()));
   return debug_canvas_->getDrawCommandAt(index);
 }
 
 double BenchmarkingCanvas::GetTime(size_t index) {
   DCHECK_LT(index,  static_cast<size_t>(debug_canvas_->getSize()));
   return timing_canvas_->GetTime(index);
 }
 
 } // namespace skia