| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "app/gfx/canvas.h" | 7 #include "gfx/canvas.h" |
| 8 | 8 |
| 9 #include "app/gfx/font.h" | |
| 10 #include "base/scoped_cftyperef.h" | 9 #include "base/scoped_cftyperef.h" |
| 11 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| 11 #include "gfx/font.h" |
| 12 #include "gfx/rect.h" | 12 #include "gfx/rect.h" |
| 13 #include "third_party/skia/include/core/SkShader.h" | 13 #include "third_party/skia/include/core/SkShader.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 Canvas::Canvas(int width, int height, bool is_opaque) | 17 Canvas::Canvas(int width, int height, bool is_opaque) |
| 18 : skia::PlatformCanvas(width, height, is_opaque) { | 18 : skia::PlatformCanvas(width, height, is_opaque) { |
| 19 } | 19 } |
| 20 | 20 |
| 21 Canvas::Canvas() : skia::PlatformCanvas() { | 21 Canvas::Canvas() : skia::PlatformCanvas() { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 CGPathAddRect(path, NULL, text_bounds); | 69 CGPathAddRect(path, NULL, text_bounds); |
| 70 | 70 |
| 71 scoped_cftyperef<CTFrameRef> frame( | 71 scoped_cftyperef<CTFrameRef> frame( |
| 72 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL)); | 72 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL)); |
| 73 CTFrameDraw(frame, context); | 73 CTFrameDraw(frame, context); |
| 74 CGContextRestoreGState(context); | 74 CGContextRestoreGState(context); |
| 75 endPlatformPaint(); | 75 endPlatformPaint(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace gfx | 78 } // namespace gfx |
| OLD | NEW |