gfx/canvas_skia_mac.mm - Issue 2811032: Revert 50784 - Canvas refactoring part 3....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: gfx/canvas_skia_mac.mm

Issue 2811032: Revert 50784 - Canvas refactoring part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 6 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_skia_linux.cc ('k') | gfx/canvas_skia_paint.h » ('j') | no next file with comments »

OLD	NEW
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 "gfx/canvas.h"

8	8

9 #include "base/scoped_cftyperef.h"	9 #include "base/scoped_cftyperef.h"

10 #include "base/sys_string_conversions.h"	10 #include "base/sys_string_conversions.h"

11 #include "gfx/font.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 CanvasSkia::CanvasSkia(int width, int height, bool is_opaque)	17 CanvasSkia::CanvasSkia(int width, int height, bool is_opaque)

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 CGPathAddRect(path, NULL, text_bounds);	75 CGPathAddRect(path, NULL, text_bounds);

76	76

77 scoped_cftyperef<CTFrameRef> frame(	77 scoped_cftyperef<CTFrameRef> frame(

78 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));	78 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));

79 CTFrameDraw(frame, context);	79 CTFrameDraw(frame, context);

80 CGContextRestoreGState(context);	80 CGContextRestoreGState(context);

81 endPlatformPaint();	81 endPlatformPaint();

82 }	82 }

83	83

84 } // namespace gfx	84 } // namespace gfx

OLD	NEW