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 <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "third_party/skia/include/core/SkBitmap.h" | 11 #include "third_party/skia/include/core/SkBitmap.h" |
12 #include "third_party/skia/include/effects/SkGradientShader.h" | 12 #include "third_party/skia/include/effects/SkGradientShader.h" |
13 #include "ui/gfx/canvas.h" | 13 #include "ui/gfx/canvas.h" |
14 #include "ui/gfx/font.h" | 14 #include "ui/gfx/font.h" |
15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 16 #include "ui/gfx/size_conversions.h" |
16 #include "ui/gfx/skia_util.h" | 17 #include "ui/gfx/skia_util.h" |
17 #include "ui/gfx/transform.h" | 18 #include "ui/gfx/transform.h" |
18 | 19 |
19 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
20 #include "ui/gfx/canvas_skia_paint.h" | 21 #include "ui/gfx/canvas_skia_paint.h" |
21 #endif | 22 #endif |
22 | 23 |
23 namespace gfx { | 24 namespace gfx { |
24 | 25 |
25 Canvas::Canvas(const gfx::Size& size, | 26 Canvas::Canvas(const gfx::Size& size, |
26 ui::ScaleFactor scale_factor, | 27 ui::ScaleFactor scale_factor, |
27 bool is_opaque) | 28 bool is_opaque) |
28 : scale_factor_(scale_factor), | 29 : scale_factor_(scale_factor), |
29 owned_canvas_(NULL), | 30 owned_canvas_(NULL), |
30 canvas_(NULL) { | 31 canvas_(NULL) { |
31 gfx::Size pixel_size = size.Scale(ui::GetScaleFactorScale(scale_factor)); | 32 gfx::Size pixel_size = gfx::ToFlooredSize(size.Scale( |
| 33 ui::GetScaleFactorScale(scale_factor))); |
32 owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(), | 34 owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(), |
33 pixel_size.height(), | 35 pixel_size.height(), |
34 is_opaque)); | 36 is_opaque)); |
35 canvas_ = owned_canvas_.get(); | 37 canvas_ = owned_canvas_.get(); |
36 #if defined(OS_WIN) || defined(OS_MACOSX) | 38 #if defined(OS_WIN) || defined(OS_MACOSX) |
37 // skia::PlatformCanvas instances are initialized to 0 by Cairo on Linux, but | 39 // skia::PlatformCanvas instances are initialized to 0 by Cairo on Linux, but |
38 // uninitialized on Win and Mac. | 40 // uninitialized on Win and Mac. |
39 if (!is_opaque) | 41 if (!is_opaque) |
40 owned_canvas_->clear(SkColorSetARGB(0, 0, 0, 0)); | 42 owned_canvas_->clear(SkColorSetARGB(0, 0, 0, 0)); |
41 #endif | 43 #endif |
(...skipping 25 matching lines...) Expand all Loading... |
67 // static | 69 // static |
68 Canvas* Canvas::CreateCanvasWithoutScaling(SkCanvas* canvas, | 70 Canvas* Canvas::CreateCanvasWithoutScaling(SkCanvas* canvas, |
69 ui::ScaleFactor scale_factor) { | 71 ui::ScaleFactor scale_factor) { |
70 return new Canvas(canvas, scale_factor); | 72 return new Canvas(canvas, scale_factor); |
71 } | 73 } |
72 | 74 |
73 void Canvas::RecreateBackingCanvas(const gfx::Size& size, | 75 void Canvas::RecreateBackingCanvas(const gfx::Size& size, |
74 ui::ScaleFactor scale_factor, | 76 ui::ScaleFactor scale_factor, |
75 bool is_opaque) { | 77 bool is_opaque) { |
76 scale_factor_ = scale_factor; | 78 scale_factor_ = scale_factor; |
77 gfx::Size pixel_size = size.Scale(ui::GetScaleFactorScale(scale_factor)); | 79 gfx::Size pixel_size = gfx::ToFlooredSize( |
| 80 size.Scale(ui::GetScaleFactorScale(scale_factor))); |
78 owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(), | 81 owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(), |
79 pixel_size.height(), | 82 pixel_size.height(), |
80 is_opaque)); | 83 is_opaque)); |
81 canvas_ = owned_canvas_.get(); | 84 canvas_ = owned_canvas_.get(); |
82 SkScalar scale = SkFloatToScalar(ui::GetScaleFactorScale(scale_factor_)); | 85 SkScalar scale = SkFloatToScalar(ui::GetScaleFactorScale(scale_factor_)); |
83 canvas_->scale(scale, scale); | 86 canvas_->scale(scale, scale); |
84 } | 87 } |
85 | 88 |
86 // static | 89 // static |
87 int Canvas::GetStringWidth(const string16& text, const gfx::Font& font) { | 90 int Canvas::GetStringWidth(const string16& text, const gfx::Font& font) { |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 | 532 |
530 float bitmap_scale = image_rep.GetScale(); | 533 float bitmap_scale = image_rep.GetScale(); |
531 if (scale_x < bitmap_scale || scale_y < bitmap_scale) | 534 if (scale_x < bitmap_scale || scale_y < bitmap_scale) |
532 const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap(); | 535 const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap(); |
533 } | 536 } |
534 | 537 |
535 return image_rep; | 538 return image_rep; |
536 } | 539 } |
537 | 540 |
538 } // namespace gfx | 541 } // namespace gfx |
OLD | NEW |