From 9a53fd7c41554630124522f4b6eedc16912abbb7 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Mon, 22 Jun 2015 09:46:59 -0700 Subject: Begin kLegacyFontHost_InitType cleanup This CL starts the process of pushing kLegacyFontHost_InitType-type SkSurfaceProps up the call stack and out of Skia. It: Gets rid of the default SkBaseDevice ctor. This means everyone has to always hand an explicit SkSurfaceProps to it. It makes public the SkBitmapDevice creation methods that require SkSurfaceProps. Removes (in Skia's code base) all SkBitmapDevice ctor calls w/o SkSurfaceProps. Makes the "recording" canvases (e.g., pdf, svg, xps) explicitly not use kLegacyFontHost_InitType. Replicates the creating canvas/device's flags on saveLayer devices BUG=skia:3934 Review URL: https://codereview.chromium.org/1204433002 --- tests/PremulAlphaRoundTripTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/PremulAlphaRoundTripTest.cpp') diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp index 9f5d6ff338..e48885c930 100644 --- a/tests/PremulAlphaRoundTripTest.cpp +++ b/tests/PremulAlphaRoundTripTest.cpp @@ -74,10 +74,11 @@ DEF_GPUTEST(PremulAlphaRoundTrip, reporter, factory) { glCtxTypeCnt = GrContextFactory::kGLContextTypeCnt; } #endif + SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType); for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) { SkAutoTUnref device; if (0 == dtype) { - device.reset(SkBitmapDevice::Create(info)); + device.reset(SkBitmapDevice::Create(info, props)); } else { #if SK_SUPPORT_GPU GrContextFactory::GLContextType type = @@ -89,7 +90,6 @@ DEF_GPUTEST(PremulAlphaRoundTrip, reporter, factory) { if (NULL == ctx) { continue; } - SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType); device.reset(SkGpuDevice::Create(ctx, SkSurface::kNo_Budgeted, info, 0, &props)); #else continue; -- cgit v1.2.3