diff options
author | 2015-11-06 16:10:34 -0800 | |
---|---|---|
committer | 2015-11-06 16:10:34 -0800 | |
commit | d75ccc6a0a2eb166234d919ffd3f62ed39dd3a6e (patch) | |
tree | 20c86bdd01504bf32ba87157bc87513d1d57481b /src/gpu/GrTest.cpp | |
parent | 3b484a40b3be7f0262afadeaf6b741ba5cedcfe1 (diff) |
Revert of Add text animation sample; tweak DrawShip sample (patchset #3 id:40001 of https://codereview.chromium.org/1410663005/ )
Reason for revert:
CrOS bots failing.
Original issue's description:
> Add text animation sample; tweak DrawShip sample
>
> Committed: https://skia.googlesource.com/skia/+/3b484a40b3be7f0262afadeaf6b741ba5cedcfe1
TBR=robertphillips@google.com,bsalomon@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1408063015
Diffstat (limited to 'src/gpu/GrTest.cpp')
-rw-r--r-- | src/gpu/GrTest.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp index 7a44942a16..4adc3f7b7b 100644 --- a/src/gpu/GrTest.cpp +++ b/src/gpu/GrTest.cpp @@ -11,12 +11,10 @@ #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 { @@ -99,35 +97,6 @@ void GrContext::printGpuStats() const { 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); |