Merge from Chromium at DEPS revision 30.0.1599.101
This commit was generated by merge_to_master.py.
Change-Id: I3349611c58937bf63f99e9d8c0c44ea74618fac5
diff --git a/gpu/GrTextContext.cpp b/gpu/GrTextContext.cpp
index 8f0f1cf..5a2c315 100644
--- a/gpu/GrTextContext.cpp
+++ b/gpu/GrTextContext.cpp
@@ -152,13 +152,13 @@
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();