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

Unified Diff: cc/font_atlas.cc

Issue 11360178: Delete ThreadChecker from FontAtlas. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « cc/font_atlas.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/font_atlas.cc
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index aabeb7e217cb8aa6361cd3eff44c12f3dd785653..5cb2daf58f7cac024bf457de6b68eb31d4c03ad3 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/string_split.h"
-#include "cc/proxy.h"
#include "third_party/skia/include/core/SkCanvas.h"
namespace cc {
@@ -28,8 +27,6 @@ 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());
-
std::vector<std::string> lines;
base::SplitString(text, '\n', &lines);
@@ -44,8 +41,6 @@ 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());
-
gfx::Point position = destPosition;
for (unsigned i = 0; i < textLine.length(); ++i) {
// If the ASCII code is out of bounds, then index 0 is used, which is just a plain rectangle glyph.
@@ -78,8 +73,6 @@ gfx::Size FontAtlas::textSize(const std::string& text)
void FontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPosition) const
{
- 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()));
}
« no previous file with comments | « cc/font_atlas.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698