Index: cc/font_atlas.cc |
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc |
index 20ed9df7ed0080965df8917800f49e58e3023512..c07be75e1b84d2079cbf7157345a2cce13d52f38 100644 |
--- a/cc/font_atlas.cc |
+++ b/cc/font_atlas.cc |
@@ -17,7 +17,7 @@ namespace cc { |
using namespace std; |
-CCFontAtlas::CCFontAtlas(SkBitmap bitmap, IntRect asciiToRectTable[128], int fontHeight) |
+FontAtlas::FontAtlas(SkBitmap bitmap, IntRect asciiToRectTable[128], int fontHeight) |
: m_atlas(bitmap) |
, m_fontHeight(fontHeight) |
{ |
@@ -25,13 +25,13 @@ CCFontAtlas::CCFontAtlas(SkBitmap bitmap, IntRect asciiToRectTable[128], int fon |
m_asciiToRectTable[i] = asciiToRectTable[i]; |
} |
-CCFontAtlas::~CCFontAtlas() |
+FontAtlas::~FontAtlas() |
{ |
} |
-void CCFontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::string& text, const gfx::Point& destPosition, const IntSize& clip) const |
+void FontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::string& text, const gfx::Point& destPosition, const IntSize& clip) const |
{ |
- ASSERT(CCProxy::isImplThread()); |
+ ASSERT(Proxy::isImplThread()); |
std::vector<std::string> lines; |
base::SplitString(text, '\n', &lines); |
@@ -45,9 +45,9 @@ void CCFontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::st |
} |
} |
-void CCFontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& paint, const std::string& textLine, const gfx::Point& destPosition) const |
+void FontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& paint, const std::string& textLine, const gfx::Point& destPosition) const |
{ |
- ASSERT(CCProxy::isImplThread()); |
+ ASSERT(Proxy::isImplThread()); |
gfx::Point position = destPosition; |
for (unsigned i = 0; i < textLine.length(); ++i) { |
@@ -60,9 +60,9 @@ void CCFontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& pai |
} |
} |
-void CCFontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const |
+void FontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const |
{ |
- ASSERT(CCProxy::isImplThread()); |
+ ASSERT(Proxy::isImplThread()); |
SkIRect source = SkIRect::MakeWH(m_atlas.width(), m_atlas.height()); |
canvas->drawBitmapRect(m_atlas, &source, SkRect::MakeXYWH(destPosition.x(), destPosition.y(), m_atlas.width(), m_atlas.height())); |