OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/gfx/canvas.h" | 5 #include "ui/gfx/canvas.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <limits> | 8 #include <limits> |
9 | 9 |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/ptr_util.h" | |
12 #include "cc/paint/paint_flags.h" | 13 #include "cc/paint/paint_flags.h" |
13 #include "cc/paint/paint_shader.h" | 14 #include "cc/paint/paint_shader.h" |
15 #include "cc/paint/skia_paint_canvas.h" | |
14 #include "third_party/skia/include/core/SkBitmap.h" | 16 #include "third_party/skia/include/core/SkBitmap.h" |
15 #include "third_party/skia/include/core/SkPath.h" | 17 #include "third_party/skia/include/core/SkPath.h" |
16 #include "third_party/skia/include/core/SkRefCnt.h" | 18 #include "third_party/skia/include/core/SkRefCnt.h" |
17 #include "third_party/skia/include/effects/SkGradientShader.h" | 19 #include "third_party/skia/include/effects/SkGradientShader.h" |
18 #include "ui/gfx/font_list.h" | 20 #include "ui/gfx/font_list.h" |
19 #include "ui/gfx/geometry/insets_f.h" | 21 #include "ui/gfx/geometry/insets_f.h" |
20 #include "ui/gfx/geometry/rect.h" | 22 #include "ui/gfx/geometry/rect.h" |
21 #include "ui/gfx/geometry/rect_conversions.h" | 23 #include "ui/gfx/geometry/rect_conversions.h" |
22 #include "ui/gfx/geometry/rect_f.h" | 24 #include "ui/gfx/geometry/rect_f.h" |
23 #include "ui/gfx/geometry/safe_integer_conversions.h" | 25 #include "ui/gfx/geometry/safe_integer_conversions.h" |
24 #include "ui/gfx/geometry/size_conversions.h" | 26 #include "ui/gfx/geometry/size_conversions.h" |
25 #include "ui/gfx/scoped_canvas.h" | 27 #include "ui/gfx/scoped_canvas.h" |
26 #include "ui/gfx/skia_paint_util.h" | 28 #include "ui/gfx/skia_paint_util.h" |
27 #include "ui/gfx/skia_util.h" | 29 #include "ui/gfx/skia_util.h" |
28 #include "ui/gfx/transform.h" | 30 #include "ui/gfx/transform.h" |
29 | 31 |
30 namespace gfx { | 32 namespace gfx { |
31 | 33 |
32 namespace { | 34 namespace { |
33 | 35 |
34 sk_sp<cc::PaintSurface> CreateSurface(const Size& size, bool is_opaque) { | 36 std::unique_ptr<cc::PaintCanvas> CreateCanvas(const Size& size, |
danakj
2017/03/22 15:06:51
vmpstr is also changing this code in https://coder
| |
35 // SkSurface cannot be zero-sized, but clients of Canvas sometimes request | 37 bool is_opaque) { |
36 // that (and then later resize). | |
37 int width = std::max(size.width(), 1); | |
38 int height = std::max(size.height(), 1); | |
39 SkAlphaType alpha = is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType; | 38 SkAlphaType alpha = is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType; |
40 SkImageInfo info = SkImageInfo::MakeN32(width, height, alpha); | 39 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alpha); |
41 return cc::PaintSurface::MakeRaster(info); | 40 return cc::SkiaPaintCanvas::CreateRasterZeroed(info); |
42 } | 41 } |
43 | 42 |
44 } // namespace | 43 } // namespace |
45 | 44 |
46 Canvas::Canvas(const Size& size, float image_scale, bool is_opaque) | 45 Canvas::Canvas(const Size& size, float image_scale, bool is_opaque) |
47 : image_scale_(image_scale) { | 46 : image_scale_(image_scale) { |
48 Size pixel_size = ScaleToCeiledSize(size, image_scale); | 47 Size pixel_size = ScaleToCeiledSize(size, image_scale); |
49 surface_ = CreateSurface(pixel_size, is_opaque); | 48 owned_canvas_ = CreateCanvas(pixel_size, is_opaque); |
50 canvas_ = surface_->getCanvas(); | 49 canvas_ = owned_canvas_.get(); |
51 | 50 |
52 #if !defined(USE_CAIRO) | 51 #if !defined(USE_CAIRO) |
53 // skia::PlatformCanvas instances are initialized to 0 by Cairo, but | 52 // skia::PlatformCanvas instances are initialized to 0 by Cairo, but |
54 // uninitialized on other platforms. | 53 // uninitialized on other platforms. |
55 if (!is_opaque) | 54 if (!is_opaque) |
56 canvas_->clear(SkColorSetARGB(0, 0, 0, 0)); | 55 canvas_->clear(SkColorSetARGB(0, 0, 0, 0)); |
57 #endif | 56 #endif |
58 | 57 |
59 SkScalar scale_scalar = SkFloatToScalar(image_scale); | 58 SkScalar scale_scalar = SkFloatToScalar(image_scale); |
60 canvas_->scale(scale_scalar, scale_scalar); | 59 canvas_->scale(scale_scalar, scale_scalar); |
61 } | 60 } |
62 | 61 |
63 Canvas::Canvas() | 62 Canvas::Canvas() |
64 : image_scale_(1.f), | 63 : image_scale_(1.f), |
65 surface_(CreateSurface({0, 0}, false)), | 64 owned_canvas_(CreateCanvas({0, 0}, false)), |
66 canvas_(surface_->getCanvas()) {} | 65 canvas_(owned_canvas_.get()) {} |
67 | 66 |
68 Canvas::Canvas(cc::PaintCanvas* canvas, float image_scale) | 67 Canvas::Canvas(cc::PaintCanvas* canvas, float image_scale) |
69 : image_scale_(image_scale), canvas_(canvas) { | 68 : image_scale_(image_scale), canvas_(canvas) { |
70 DCHECK(canvas_); | 69 DCHECK(canvas_); |
71 } | 70 } |
72 | 71 |
73 Canvas::~Canvas() { | 72 Canvas::~Canvas() { |
74 } | 73 } |
75 | 74 |
76 void Canvas::RecreateBackingCanvas(const Size& size, | 75 void Canvas::RecreateBackingCanvas(const Size& size, |
77 float image_scale, | 76 float image_scale, |
78 bool is_opaque) { | 77 bool is_opaque) { |
79 image_scale_ = image_scale; | 78 image_scale_ = image_scale; |
80 Size pixel_size = ScaleToFlooredSize(size, image_scale); | 79 Size pixel_size = ScaleToFlooredSize(size, image_scale); |
81 surface_ = CreateSurface(pixel_size, is_opaque); | 80 owned_canvas_ = CreateCanvas(pixel_size, is_opaque); |
82 canvas_ = surface_->getCanvas(); | 81 canvas_ = owned_canvas_.get(); |
83 | 82 |
84 SkScalar scale_scalar = SkFloatToScalar(image_scale); | 83 SkScalar scale_scalar = SkFloatToScalar(image_scale); |
85 canvas_->scale(scale_scalar, scale_scalar); | 84 canvas_->scale(scale_scalar, scale_scalar); |
86 } | 85 } |
87 | 86 |
88 // static | 87 // static |
89 void Canvas::SizeStringInt(const base::string16& text, | 88 void Canvas::SizeStringInt(const base::string16& text, |
90 const FontList& font_list, | 89 const FontList& font_list, |
91 int* width, | 90 int* width, |
92 int* height, | 91 int* height, |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
613 flags.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality); | 612 flags.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality); |
614 flags.setShader(CreateImageRepShaderForScale( | 613 flags.setShader(CreateImageRepShaderForScale( |
615 image_rep, SkShader::kRepeat_TileMode, shader_scale, | 614 image_rep, SkShader::kRepeat_TileMode, shader_scale, |
616 remove_image_scale ? image_rep.scale() : 1.f)); | 615 remove_image_scale ? image_rep.scale() : 1.f)); |
617 | 616 |
618 // The rect will be filled by the bitmap. | 617 // The rect will be filled by the bitmap. |
619 canvas_->drawRect(dest_rect, flags); | 618 canvas_->drawRect(dest_rect, flags); |
620 } | 619 } |
621 | 620 |
622 } // namespace gfx | 621 } // namespace gfx |
OLD | NEW |