| Index: cc/font_atlas.cc
|
| diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
|
| index 099e7f0d5819c0e774783d40e883b869fe08c8d9..aabeb7e217cb8aa6361cd3eff44c12f3dd785653 100644
|
| --- a/cc/font_atlas.cc
|
| +++ b/cc/font_atlas.cc
|
| @@ -28,7 +28,7 @@ FontAtlas::~FontAtlas()
|
|
|
| void FontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::string& text, const gfx::Point& destPosition, const gfx::Size& clip) const
|
| {
|
| - DCHECK(Proxy::isImplThread());
|
| + DCHECK(m_threadChecker.CalledOnValidThread());
|
|
|
| std::vector<std::string> lines;
|
| base::SplitString(text, '\n', &lines);
|
| @@ -44,7 +44,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) {
|
| @@ -78,7 +78,7 @@ gfx::Size FontAtlas::textSize(const std::string& text)
|
|
|
| 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()));
|
|
|