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

Unified Diff: cc/font_atlas.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months 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 side-by-side diff with in-line comments
Download patch
Index: cc/font_atlas.cc
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index a1c4dd510f1cce2017c92b16ee918882ac5f218c..eabbc0c760a15856fec19932977c20de38aa1cc4 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -31,7 +31,7 @@ CCFontAtlas::~CCFontAtlas()
void CCFontAtlas::drawText(SkCanvas* canvas, const SkPaint& paint, const std::string& text, const gfx::Point& destPosition, const IntSize& clip) const
{
- DCHECK(CCProxy::isImplThread());
+// DCHECK(CCProxy::isImplThread());
jamesr 2012/10/22 22:00:36 just nuking these dchecks would be OK, IMO
std::vector<std::string> lines;
base::SplitString(text, '\n', &lines);
@@ -47,7 +47,7 @@ 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
{
- DCHECK(CCProxy::isImplThread());
+// DCHECK(CCProxy::isImplThread());
gfx::Point position = destPosition;
for (unsigned i = 0; i < textLine.length(); ++i) {
@@ -62,7 +62,7 @@ void CCFontAtlas::drawOneLineOfTextInternal(SkCanvas* canvas, const SkPaint& pai
void CCFontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const
{
- DCHECK(CCProxy::isImplThread());
+// DCHECK(CCProxy::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()));

Powered by Google App Engine
This is Rietveld 408576698