diff options
| author |  Brian Osman <brianosman@google.com> | 2016-10-14 09:16:21 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-14 14:34:28 +0000 |
| commit | 777b5633f599f2a99e2035fdb7ab600779ab95ac (patch) | |
| tree | 4be51fc9ef3f62806b5e5dead41ce73e1785996f /src | |
| parent | 30d99c66f5ed817fc601809ce619e55ec91b36f9 (diff) | |
Remove many uses of kSkia8888 and kSkiaGamma8888
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3405
Change-Id: Ie920f4bcbb3dd28114a66f2363643bb10009b840
Reviewed-on: https://skia-review.googlesource.com/3405
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/text/GrAtlasTextContext.cpp | 2 | ||||
| -rw-r--r-- | src/views/SkWindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/text/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp index 285aea4d2a..83c34dfca8 100644 --- a/src/gpu/text/GrAtlasTextContext.cpp +++ b/src/gpu/text/GrAtlasTextContext.cpp @@ -390,7 +390,7 @@ DRAW_BATCH_TEST_DEFINE(TextBlobBatch) { // Setup dummy SkPaint / GrPaint / GrDrawContext sk_sp<GrDrawContext> drawContext(context->makeDrawContext(SkBackingFit::kApprox, 1024, 1024, - kSkia8888_GrPixelConfig, nullptr)); + kRGBA_8888_GrPixelConfig, nullptr)); GrColor color = GrRandomColor(random); SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random); diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp index 6e1ebf7a75..d82187a3b6 100644 --- a/src/views/SkWindow.cpp +++ b/src/views/SkWindow.cpp @@ -344,7 +344,7 @@ sk_sp<SkSurface> SkWindow::makeGpuBackedSurface(const AttachmentInfo& attachment grContext->caps()->srgbSupport() && SkImageInfoIsGammaCorrect(info()) && (attachmentInfo.fColorBits != 30) - ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig; + ? kSRGBA_8888_GrPixelConfig : kRGBA_8888_GrPixelConfig; desc.fOrigin = kBottomLeft_GrSurfaceOrigin; desc.fSampleCnt = attachmentInfo.fSampleCount; desc.fStencilBits = attachmentInfo.fStencilBits; |