Revert of Add text animation sample; tweak DrawShip sample

src/gpu/GrTest.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTest.h"
 
 #include "GrBatchAtlas.h"
 #include "GrBatchFontCache.h"
 #include "GrContextOptions.h"
-#include "GrDrawContext.h"
 #include "GrDrawingManager.h"
 #include "GrGpuResourceCacheAccess.h"
 #include "GrResourceCache.h"
 #include "GrTextBlobCache.h"
-#include "SkGrPriv.h"
 #include "SkString.h"
 
 namespace GrTest {
 void SetupAlwaysEvictAtlas(GrContext* context) {
     // These sizes were selected because they allow each atlas to hold a single plot and will thus
     // stress the atlas
     int dim = GrBatchAtlas::kGlyphMaxDim;
     GrBatchAtlasConfig configs[3];
     configs[kA8_GrMaskFormat].fWidth = dim;
     configs[kA8_GrMaskFormat].fHeight = dim;
@@ skipping 62 matching lines @@
     return fGpu->stats()->dump(out);
 #endif
 }
 
 void GrContext::printGpuStats() const {
     SkString out;
     this->dumpGpuStats(&out);
     SkDebugf("%s", out.c_str());
 }
 
-void GrContext::drawFontCache(const SkRect& rect, GrMaskFormat format, const SkPaint& paint,
-                              GrRenderTarget* target) {
-    GrBatchFontCache* cache = this->getBatchFontCache();
-
-    GrTexture* atlas = cache->getTexture(format);
-
-    SkAutoTUnref<GrDrawContext> drawContext(this->drawContext(target));
-    // TODO: add drawContext method to encapsulate this.
-
-    GrPaint grPaint;
-    SkMatrix mat;
-    mat.reset();
-    if (!SkPaintToGrPaint(this, paint, mat, &grPaint)) {
-        return;
-    }
-    SkMatrix textureMat;
-    textureMat.reset();
-    // TODO: use setScaleTranslate()
-    textureMat[SkMatrix::kMScaleX] = 1.0f/rect.width();
-    textureMat[SkMatrix::kMScaleY] = 1.0f/rect.height();
-    textureMat[SkMatrix::kMTransX] = -rect.fLeft/rect.width();
-    textureMat[SkMatrix::kMTransY] = -rect.fTop/rect.height();
-
-    grPaint.addColorTextureProcessor(atlas, textureMat);
-
-    GrClip clip;
-    drawContext->drawRect(clip, grPaint, mat, rect);
-}
-
 #if GR_GPU_STATS
 void GrGpu::Stats::dump(SkString* out) {
     out->appendf("Render Target Binds: %d\n", fRenderTargetBinds);
     out->appendf("Shader Compilations: %d\n", fShaderCompilations);
     out->appendf("Textures Created: %d\n", fTextureCreates);
     out->appendf("Texture Uploads: %d\n", fTextureUploads);
     out->appendf("Stencil Buffer Creates: %d\n", fStencilAttachmentCreates);
     out->appendf("Number of draws: %d\n", fNumDraws);
 }
 #endif
@@ skipping 178 matching lines @@
     SkASSERT(nullptr == fGpu);
     fGpu = new MockGpu(this, options);
     SkASSERT(fGpu);
     this->initCommon(options);
 
     // We delete these because we want to test the cache starting with zero resources. Also, none of
     // these objects are required for any of tests that use this context. TODO: make stop allocating
     // resources in the buffer pools.
     fDrawingManager->abandon();
 }