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

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 165444 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 "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
13 #include "ui/gfx/rect.h" 14 #include "ui/gfx/rect.h"
14 15
15 class SkCanvas; 16 class SkCanvas;
16 17
17 namespace gfx { 18 namespace gfx {
18 class Point; 19 class Point;
19 class Size; 20 class Size;
20 } 21 }
21 22
(...skipping 25 matching lines...) Expand all
47 void drawOneLineOfTextInternal(SkCanvas*, const SkPaint&, const std::string& , const gfx::Point& destPosition) const; 48 void drawOneLineOfTextInternal(SkCanvas*, const SkPaint&, const std::string& , const gfx::Point& destPosition) const;
48 49
49 // The actual texture atlas containing all the pre-rendered glyphs. 50 // The actual texture atlas containing all the pre-rendered glyphs.
50 SkBitmap m_atlas; 51 SkBitmap m_atlas;
51 52
52 // The look-up tables mapping ascii characters to their gfx::Rect locations on the atlas. 53 // The look-up tables mapping ascii characters to their gfx::Rect locations on the atlas.
53 gfx::Rect m_asciiToRectTable[128]; 54 gfx::Rect m_asciiToRectTable[128];
54 55
55 int m_fontHeight; 56 int m_fontHeight;
56 57
58 base::ThreadChecker m_threadChecker;
59
57 DISALLOW_COPY_AND_ASSIGN(FontAtlas); 60 DISALLOW_COPY_AND_ASSIGN(FontAtlas);
58 }; 61 };
59 62
60 } // namespace cc 63 } // namespace cc
61 64
62 #endif 65 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698