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

Side by Side Diff: cc/font_atlas.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 165064 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
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 #ifndef CCFontAtlas_h 5 #ifndef CCFontAtlas_h
6 #define CCFontAtlas_h 6 #define CCFontAtlas_h
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/threading/thread_checker.h"
12 #include "IntRect.h" 13 #include "IntRect.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 14 #include "third_party/skia/include/core/SkBitmap.h"
14 15
15 class SkCanvas; 16 class SkCanvas;
16 17
17 namespace gfx { 18 namespace gfx {
18 class Point; 19 class Point;
19 } 20 }
20 21
21 namespace cc { 22 namespace cc {
(...skipping 26 matching lines...) Expand all
48 void drawOneLineOfTextInternal(SkCanvas*, const SkPaint&, const std::string& , const gfx::Point& destPosition) const; 49 void drawOneLineOfTextInternal(SkCanvas*, const SkPaint&, const std::string& , const gfx::Point& destPosition) const;
49 50
50 // The actual texture atlas containing all the pre-rendered glyphs. 51 // The actual texture atlas containing all the pre-rendered glyphs.
51 SkBitmap m_atlas; 52 SkBitmap m_atlas;
52 53
53 // The look-up tables mapping ascii characters to their IntRect locations on the atlas. 54 // The look-up tables mapping ascii characters to their IntRect locations on the atlas.
54 IntRect m_asciiToRectTable[128]; 55 IntRect m_asciiToRectTable[128];
55 56
56 int m_fontHeight; 57 int m_fontHeight;
57 58
59 base::ThreadChecker m_threadChecker;
60
58 DISALLOW_COPY_AND_ASSIGN(FontAtlas); 61 DISALLOW_COPY_AND_ASSIGN(FontAtlas);
59 }; 62 };
60 63
61 } // namespace cc 64 } // namespace cc
62 65
63 #endif 66 #endif
OLDNEW
« no previous file with comments | « cc/delegated_renderer_layer_impl_unittest.cc ('k') | cc/font_atlas.cc » ('j') | cc/gl_renderer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698