diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 07:17:46 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 07:17:46 +0000 |
| commit | 068d7ef6aed7f5a7bdaf1e8d28b422c547be294d (patch) | |
| tree | a66fd6a12e3a9ae7ef16c66043fd4e4bebe4d28c /cc/font_atlas.cc | |
| parent | 2bddc10a9e71bd3e7d7f010b46ec96c7ab623336 (diff) | |
| download | chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.zip chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.tar.gz chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.tar.bz2 | |
A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2
BUG=152904
Review URL: https://chromiumcodereview.appspot.com/11232051
TBR=aelias@chromium.org
Review URL: https://codereview.chromium.org/11369071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/font_atlas.cc')
| -rw-r--r-- | cc/font_atlas.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc index 2f18e02..2d15766 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(m_threadChecker.CalledOnValidThread()); + DCHECK(Proxy::isImplThread()); 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(m_threadChecker.CalledOnValidThread()); + DCHECK(Proxy::isImplThread()); gfx::Point position = destPosition; for (unsigned i = 0; i < textLine.length(); ++i) { @@ -59,7 +59,7 @@ void FontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& paint void FontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const { - DCHECK(m_threadChecker.CalledOnValidThread()); + DCHECK(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())); |