Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: gfx/canvas_mac.mm

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gfx/canvas_linux.cc ('k') | gfx/canvas_paint.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « gfx/canvas_linux.cc ('k') | gfx/canvas_paint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698