cc/font_atlas.cc - Issue 11228059: cc: Remove CC*.h temporary includes, part 6/4.

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: cc/font_atlas.cc

Issue 11228059: cc: Remove CC*.h temporary includes, part 6/4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase - fix conflicts Created 8 years, 1 month 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

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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 "config.h"	5 #include "config.h"

6	6

7 #include "CCFontAtlas.h"	7 #include "cc/font_atlas.h"

8	8

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/string_split.h"	11 #include "base/string_split.h"

12 #include "cc/proxy.h"	12 #include "cc/proxy.h"

13 #include "third_party/skia/include/core/SkCanvas.h"	13 #include "third_party/skia/include/core/SkCanvas.h"

14 #include "ui/gfx/point.h"	14 #include "ui/gfx/point.h"

15	15

16 namespace cc {	16 namespace cc {

17	17

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62	62

63 void FontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const	63 void FontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const

64 {	64 {

65 DCHECK(Proxy::isImplThread());	65 DCHECK(Proxy::isImplThread());

66	66

67 SkIRect source = SkIRect::MakeWH(m_atlas.width(), m_atlas.height());	67 SkIRect source = SkIRect::MakeWH(m_atlas.width(), m_atlas.height());

68 canvas->drawBitmapRect(m_atlas, &source, SkRect::MakeXYWH(destPosition.x(), destPosition.y(), m_atlas.width(), m_atlas.height()));	68 canvas->drawBitmapRect(m_atlas, &source, SkRect::MakeXYWH(destPosition.x(), destPosition.y(), m_atlas.width(), m_atlas.height()));

69 }	69 }

70	70

71 } // namespace cc	71 } // namespace cc

OLD	NEW

« no previous file with comments | « cc/draw_quad_unittest.cc ('k') | cc/frame_rate_controller.cc » ('j') | no next file with comments »