summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-08 18:01:35 +0000
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-08 18:01:35 +0000
commit00c17d6d0924e6c26c17ac1762ae68fb52c88ff8 (patch)
treebfd8e692b73dee4749734ca317b4707988dfae3a
parent7fa2e8fc025b22e0c36ef1d175c0bf8a5f54aded (diff)
downloadsrc-00c17d6d0924e6c26c17ac1762ae68fb52c88ff8.tar.gz
Revert to fix Chrome issue 303803 on M30 branch of Skia.
R=jvanverth@google.com Review URL: https://codereview.chromium.org/26458004 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/src@11657 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gpu/GrTextContext.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/GrTextContext.cpp b/gpu/GrTextContext.cpp
index 8f0f1cfd..5a2c315b 100644
--- a/gpu/GrTextContext.cpp
+++ b/gpu/GrTextContext.cpp
@@ -152,13 +152,13 @@ void GrTextContext::drawPackedGlyph(GrGlyph::PackedID packed,
if (fStrike->getGlyphAtlas(glyph, scaler)) {
goto HAS_ATLAS;
}
-
+#if 0 // M30 specific revert of font cache improvement to fix https://code.google.com/p/chromium/issues/detail?id=303803
// try to clear out an unused atlas before we flush
fContext->getFontCache()->freeAtlasExceptFor(fStrike);
if (fStrike->getGlyphAtlas(glyph, scaler)) {
goto HAS_ATLAS;
}
-
+#endif
// before we purge the cache, we must flush any accumulated draws
this->flushGlyphs();
fContext->flush();