| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "GrAtlasTextBatch.h" | 8 #include "GrAtlasTextBatch.h" |
| 9 | 9 |
| 10 #include "GrBatchFlushState.h" | 10 #include "GrBatchFlushState.h" |
| 11 #include "GrResourceProvider.h" | 11 #include "GrResourceProvider.h" |
| 12 | 12 |
| 13 #include "SkGlyphCache.h" | 13 #include "SkGlyphCache.h" |
| 14 #include "SkMathPriv.h" |
| 14 | 15 |
| 15 #include "effects/GrBitmapTextGeoProc.h" | 16 #include "effects/GrBitmapTextGeoProc.h" |
| 16 #include "effects/GrDistanceFieldGeoProc.h" | 17 #include "effects/GrDistanceFieldGeoProc.h" |
| 17 #include "text/GrBatchFontCache.h" | 18 #include "text/GrBatchFontCache.h" |
| 18 | 19 |
| 19 ////////////////////////////////////////////////////////////////////////////////
/////////////////// | 20 ////////////////////////////////////////////////////////////////////////////////
/////////////////// |
| 20 | 21 |
| 21 static inline GrColor skcolor_to_grcolor_nopremultiply(SkColor c) { | 22 static inline GrColor skcolor_to_grcolor_nopremultiply(SkColor c) { |
| 22 unsigned r = SkColorGetR(c); | 23 unsigned r = SkColorGetR(c); |
| 23 unsigned g = SkColorGetG(c); | 24 unsigned g = SkColorGetG(c); |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 flags, | 304 flags, |
| 304 this->usesLocalCoords()); | 305 this->usesLocalCoords()); |
| 305 #endif | 306 #endif |
| 306 } | 307 } |
| 307 | 308 |
| 308 } | 309 } |
| 309 | 310 |
| 310 void GrBlobRegenHelper::flush() { | 311 void GrBlobRegenHelper::flush() { |
| 311 fBatch->flush(fTarget, fFlushInfo); | 312 fBatch->flush(fTarget, fFlushInfo); |
| 312 } | 313 } |
| OLD | NEW |