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_paint_mac.h" | 5 #include "ui/gfx/canvas_paint_mac.h" |
6 #include "ui/gfx/geometry/size.h" | 6 #include "ui/gfx/geometry/size.h" |
7 | 7 |
8 namespace gfx { | 8 namespace gfx { |
9 | 9 |
10 CanvasSkiaPaint::CanvasSkiaPaint(NSRect dirtyRect) | 10 CanvasSkiaPaint::CanvasSkiaPaint(NSRect dirtyRect) |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 void CanvasSkiaPaint::Init(bool opaque) { | 53 void CanvasSkiaPaint::Init(bool opaque) { |
54 CGContextRef destination_context = | 54 CGContextRef destination_context = |
55 (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; | 55 (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; |
56 CGRect scaled_unit_rect = CGContextConvertRectToDeviceSpace( | 56 CGRect scaled_unit_rect = CGContextConvertRectToDeviceSpace( |
57 destination_context, CGRectMake(0, 0, 1, 1)); | 57 destination_context, CGRectMake(0, 0, 1, 1)); |
58 // Assume that the x scale and the y scale are the same. | 58 // Assume that the x scale and the y scale are the same. |
59 CGFloat scale = scaled_unit_rect.size.width; | 59 CGFloat scale = scaled_unit_rect.size.width; |
60 | 60 |
61 gfx::Size size(NSWidth(rectangle_), NSHeight(rectangle_)); | 61 gfx::Size size(NSWidth(rectangle_), NSHeight(rectangle_)); |
62 RecreateBackingCanvas(size, scale, opaque); | 62 RecreateBackingCanvas(size, scale, opaque); |
63 skia::PlatformCanvas* canvas = platform_canvas(); | 63 SkCanvas* canvas = sk_canvas(); |
f(malita)
2016/01/27 20:16:12
Nit: this looks like a functional change, even tho
| |
64 canvas->clear(SkColorSetARGB(0, 0, 0, 0)); | 64 canvas->clear(SkColorSetARGB(0, 0, 0, 0)); |
65 | 65 |
66 // Need to translate so that the dirty region appears at the origin of the | 66 // Need to translate so that the dirty region appears at the origin of the |
67 // surface. | 67 // surface. |
68 canvas->translate(-SkDoubleToScalar(NSMinX(rectangle_)), | 68 canvas->translate(-SkDoubleToScalar(NSMinX(rectangle_)), |
69 -SkDoubleToScalar(NSMinY(rectangle_))); | 69 -SkDoubleToScalar(NSMinY(rectangle_))); |
70 | 70 |
71 context_ = skia::GetBitmapContext(*canvas); | 71 context_ = skia::GetBitmapContext(*canvas); |
72 } | 72 } |
73 | 73 |
74 } // namespace skia | 74 } // namespace skia |
75 | 75 |
76 | 76 |
OLD | NEW |