Merge third_party/skia/src from https://chromium.googlesource.com/a/external/skia/src.git at 00c17d6d0924e6c26c17ac1762ae68fb52c88ff8

This commit was generated by merge_from_chromium.py.

Change-Id: I2b170f77aaaf074e0025c597291680dad77f8579

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();