Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1708)

Unified Diff: skia/ext/benchmarking_canvas.cc

Issue 315963003: Switch Chromium to new Skia SkCanvas::drawPicture method (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address code review comment (fix benchmasking_canvas override) Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/skpicture_content_layer_updater.cc ('k') | skia/ext/pixel_ref_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/benchmarking_canvas.cc
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index f765cd175598e92b7ca0868e9110a4f4978d28f6..fd5e574696f27ca46a8e74033380e7f19a7d097d 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc
@@ -114,11 +114,6 @@ public:
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,
@@ -186,6 +181,11 @@ protected:
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_;
« no previous file with comments | « cc/resources/skpicture_content_layer_updater.cc ('k') | skia/ext/pixel_ref_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698