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

Unified Diff: ui/gfx/canvas.cc

Issue 1124223010: ui: Eliminate allocating gfx::Canvas on the heap for every view. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
Index: ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index ec7d74c36fcb0cc15cd430a6a6eafa5e682a6ae0..6e290490a3b6f620f473830b6f6f2846d2fece2d 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -63,13 +63,12 @@ Canvas::Canvas()
canvas_(owned_canvas_.get()) {
}
-Canvas::~Canvas() {
+Canvas::Canvas(SkCanvas* canvas, float image_scale)
+ : image_scale_(image_scale), owned_canvas_(), canvas_(canvas) {
+ DCHECK(canvas);
}
-// static
-Canvas* Canvas::CreateCanvasWithoutScaling(SkCanvas* canvas,
- float image_scale) {
- return new Canvas(canvas, image_scale);
+Canvas::~Canvas() {
}
void Canvas::RecreateBackingCanvas(const Size& size,
@@ -548,13 +547,6 @@ void Canvas::Transform(const gfx::Transform& transform) {
canvas_->concat(transform.matrix());
}
-Canvas::Canvas(SkCanvas* canvas, float image_scale)
- : image_scale_(image_scale),
- owned_canvas_(),
- canvas_(canvas) {
- DCHECK(canvas);
-}
-
bool Canvas::IntersectsClipRectInt(int x, int y, int w, int h) {
SkRect clip;
return canvas_->getClipBounds(&clip) &&

Powered by Google App Engine
This is Rietveld 408576698