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

Side by Side Diff: src/gpu/GrContext.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/GrAtlasTextContext.cpp ('k') | src/gpu/GrDrawContext.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 2011 Google Inc. 3 * Copyright 2011 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 "GrContext.h" 9 #include "GrContext.h"
10 10
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 } 113 }
114 114
115 GrDrawContext* GrContext::DrawingMgr::drawContext(const SkSurfaceProps* surfaceP rops) { 115 GrDrawContext* GrContext::DrawingMgr::drawContext(const SkSurfaceProps* surfaceP rops) {
116 if (this->abandoned()) { 116 if (this->abandoned()) {
117 return nullptr; 117 return nullptr;
118 } 118 }
119 119
120 const SkSurfaceProps props(SkSurfacePropsCopyOrDefault(surfaceProps)); 120 const SkSurfaceProps props(SkSurfacePropsCopyOrDefault(surfaceProps));
121 121
122 SkASSERT(props.pixelGeometry() < kNumPixelGeometries); 122 SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
123 if (!fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()]) { 123 if (!fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts() ]) {
124 fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()] = 124 fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts()] =
125 new GrDrawContext(fContext, fDrawTarget, props); 125 new GrDrawContext(fContext, fDrawTarget, props);
126 } 126 }
127 127
128 return fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()]; 128 return fDrawContext[props.pixelGeometry()][props.isUseDeviceIndependentFonts ()];
129 } 129 }
130 130
131 //////////////////////////////////////////////////////////////////////////////// 131 ////////////////////////////////////////////////////////////////////////////////
132 132
133 133
134 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) { 134 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) {
135 GrContextOptions defaultOptions; 135 GrContextOptions defaultOptions;
136 return Create(backend, backendContext, defaultOptions); 136 return Create(backend, backendContext, defaultOptions);
137 } 137 }
138 138
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 ////////////////////////////////////////////////////////////////////////////// 754 //////////////////////////////////////////////////////////////////////////////
755 755
756 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) { 756 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
757 fGpu->addGpuTraceMarker(marker); 757 fGpu->addGpuTraceMarker(marker);
758 } 758 }
759 759
760 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { 760 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
761 fGpu->removeGpuTraceMarker(marker); 761 fGpu->removeGpuTraceMarker(marker);
762 } 762 }
763 763
OLDNEW
« no previous file with comments | « src/gpu/GrAtlasTextContext.cpp ('k') | src/gpu/GrDrawContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698