| Index: cc/font_atlas.cc
|
| diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
|
| index d8294da8276076af6c7872eccb2b1d2cf6babe4a..1276471646c9ba131b07f6646fa471f1c2b043f4 100644
|
| --- a/cc/font_atlas.cc
|
| +++ b/cc/font_atlas.cc
|
| @@ -31,7 +31,7 @@ FontAtlas::~FontAtlas()
|
|
|
| void FontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::string& text, const gfx::Point& destPosition, const IntSize& clip) const
|
| {
|
| - DCHECK(Proxy::isImplThread());
|
| + DCHECK(m_threadChecker.CalledOnValidThread());
|
|
|
| std::vector<std::string> lines;
|
| base::SplitString(text, '\n', &lines);
|
| @@ -47,7 +47,7 @@ void FontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::stri
|
|
|
| void FontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& paint, const std::string& textLine, const gfx::Point& destPosition) const
|
| {
|
| - DCHECK(Proxy::isImplThread());
|
| + DCHECK(m_threadChecker.CalledOnValidThread());
|
|
|
| gfx::Point position = destPosition;
|
| for (unsigned i = 0; i < textLine.length(); ++i) {
|
| @@ -62,7 +62,7 @@ void FontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& paint
|
|
|
| void FontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const
|
| {
|
| - DCHECK(Proxy::isImplThread());
|
| + DCHECK(m_threadChecker.CalledOnValidThread());
|
|
|
| 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()));
|
|
|