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

Side by Side Diff: cc/font_atlas.h

Issue 11369071: A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « cc/delegated_renderer_layer_impl_unittest.cc ('k') | cc/font_atlas.cc » ('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 #ifndef CC_FONT_ATLAS_H_ 5 #ifndef CC_FONT_ATLAS_H_
6 #define CC_FONT_ATLAS_H_ 6 #define CC_FONT_ATLAS_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"
13 #include "cc/cc_export.h" 12 #include "cc/cc_export.h"
14 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "ui/gfx/rect.h" 14 #include "ui/gfx/rect.h"
16 15
17 class SkCanvas; 16 class SkCanvas;
18 17
19 namespace gfx { 18 namespace gfx {
20 class Point; 19 class Point;
21 class Size; 20 class Size;
22 } 21 }
(...skipping 26 matching lines...) Expand all
49 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;
50 49
51 // The actual texture atlas containing all the pre-rendered glyphs. 50 // The actual texture atlas containing all the pre-rendered glyphs.
52 SkBitmap m_atlas; 51 SkBitmap m_atlas;
53 52
54 // 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.
55 gfx::Rect m_asciiToRectTable[128]; 54 gfx::Rect m_asciiToRectTable[128];
56 55
57 int m_fontHeight; 56 int m_fontHeight;
58 57
59 base::ThreadChecker m_threadChecker;
60
61 DISALLOW_COPY_AND_ASSIGN(FontAtlas); 58 DISALLOW_COPY_AND_ASSIGN(FontAtlas);
62 }; 59 };
63 60
64 } // namespace cc 61 } // namespace cc
65 62
66 #endif // CC_FONT_ATLAS_H_ 63 #endif // CC_FONT_ATLAS_H_
OLDNEW
« no previous file with comments | « cc/delegated_renderer_layer_impl_unittest.cc ('k') | cc/font_atlas.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698