Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Side by Side Diff: src/gpu/GrDrawContext.cpp

Issue 1322433006: Rename flag from "distance field" to "device independent." (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add legacy alias for chrome Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | tools/PictureRenderer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "GrAtlasTextContext.h" 9 #include "GrAtlasTextContext.h"
10 #include "GrBatchTest.h" 10 #include "GrBatchTest.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 return; 55 return;
56 } 56 }
57 57
58 fDrawTarget->copySurface(dst, src, srcRect, dstPoint); 58 fDrawTarget->copySurface(dst, src, srcRect, dstPoint);
59 } 59 }
60 60
61 GrTextContext* GrDrawContext::createTextContext(GrRenderTarget* renderTarget, 61 GrTextContext* GrDrawContext::createTextContext(GrRenderTarget* renderTarget,
62 const SkSurfaceProps& surfacePro ps) { 62 const SkSurfaceProps& surfacePro ps) {
63 if (fContext->caps()->shaderCaps()->pathRenderingSupport() && 63 if (fContext->caps()->shaderCaps()->pathRenderingSupport() &&
64 renderTarget->isStencilBufferMultisampled() && 64 renderTarget->isStencilBufferMultisampled() &&
65 fSurfaceProps.isUseDistanceFieldFonts()) { // FIXME: Rename the dff flag to be more general. 65 fSurfaceProps.isUseDeviceIndependentFonts()) {
66 GrStencilAttachment* sb = renderTarget->renderTargetPriv().attachStencil Attachment(); 66 GrStencilAttachment* sb = renderTarget->renderTargetPriv().attachStencil Attachment();
67 if (sb) { 67 if (sb) {
68 return GrStencilAndCoverTextContext::Create(fContext, this, surfaceP rops); 68 return GrStencilAndCoverTextContext::Create(fContext, this, surfaceP rops);
69 } 69 }
70 } 70 }
71 71
72 return GrAtlasTextContext::Create(fContext, this, surfaceProps); 72 return GrAtlasTextContext::Create(fContext, this, surfaceProps);
73 } 73 }
74 74
75 void GrDrawContext::drawText(GrRenderTarget* rt, const GrClip& clip, const GrPai nt& grPaint, 75 void GrDrawContext::drawText(GrRenderTarget* rt, const GrClip& clip, const GrPai nt& grPaint,
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 RETURN_FALSE_IF_ABANDONED 760 RETURN_FALSE_IF_ABANDONED
761 761
762 ASSERT_OWNED_RESOURCE(rt); 762 ASSERT_OWNED_RESOURCE(rt);
763 SkASSERT(rt); 763 SkASSERT(rt);
764 return true; 764 return true;
765 } 765 }
766 766
767 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b atch) { 767 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b atch) {
768 fDrawTarget->drawBatch(*pipelineBuilder, batch); 768 fDrawTarget->drawBatch(*pipelineBuilder, batch);
769 } 769 }
OLDNEW
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | tools/PictureRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698