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

Side by Side Diff: cc/font_atlas.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly Created 8 years, 2 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 | « cc/float_quad_unittest.cc ('k') | cc/frame_rate_controller.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 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 "CCFontAtlas.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 "ui/gfx/point.h" 12 #include "ui/gfx/point.h"
13 #include "CCProxy.h" 13 #include "cc/proxy.h"
14 #include "third_party/skia/include/core/SkCanvas.h" 14 #include "third_party/skia/include/core/SkCanvas.h"
15 15
16 namespace cc { 16 namespace cc {
17 17
18 using namespace std; 18 using namespace std;
19 19
20 CCFontAtlas::CCFontAtlas(SkBitmap bitmap, IntRect asciiToRectTable[128], int fon tHeight) 20 CCFontAtlas::CCFontAtlas(SkBitmap bitmap, IntRect asciiToRectTable[128], int fon tHeight)
21 : m_atlas(bitmap) 21 : m_atlas(bitmap)
22 , m_fontHeight(fontHeight) 22 , m_fontHeight(fontHeight)
23 { 23 {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 void CCFontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPositio n) const 63 void CCFontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPositio n) const
64 { 64 {
65 ASSERT(CCProxy::isImplThread()); 65 ASSERT(CCProxy::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
OLDNEW
« no previous file with comments | « cc/float_quad_unittest.cc ('k') | cc/frame_rate_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698