| 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) &&
|
|
|