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

Side by Side Diff: ui/gfx/canvas_skia_mac.mm

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « ui/gfx/canvas_skia_linux.cc ('k') | ui/gfx/canvas_skia_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "gfx/canvas_skia.h" 7 #include "ui/gfx/canvas_skia.h"
8 8
9 #include "base/mac/scoped_cftyperef.h" 9 #include "base/mac/scoped_cftyperef.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "gfx/font.h"
12 #include "gfx/rect.h"
13 #include "third_party/skia/include/core/SkShader.h" 11 #include "third_party/skia/include/core/SkShader.h"
12 #include "ui/gfx/font.h"
13 #include "ui/gfx/rect.h"
14 14
15 namespace gfx { 15 namespace gfx {
16 16
17 CanvasSkia::CanvasSkia(int width, int height, bool is_opaque) 17 CanvasSkia::CanvasSkia(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 CanvasSkia::CanvasSkia() : skia::PlatformCanvas() { 21 CanvasSkia::CanvasSkia() : skia::PlatformCanvas() {
22 } 22 }
23 23
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 CGPathAddRect(path, NULL, text_bounds); 79 CGPathAddRect(path, NULL, text_bounds);
80 80
81 base::mac::ScopedCFTypeRef<CTFrameRef> frame( 81 base::mac::ScopedCFTypeRef<CTFrameRef> frame(
82 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL)); 82 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));
83 CTFrameDraw(frame, context); 83 CTFrameDraw(frame, context);
84 CGContextRestoreGState(context); 84 CGContextRestoreGState(context);
85 endPlatformPaint(); 85 endPlatformPaint();
86 } 86 }
87 87
88 } // namespace gfx 88 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/canvas_skia_linux.cc ('k') | ui/gfx/canvas_skia_paint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698