From c11a527cd06a0a6c2cef0d986ea8f5ef0989505a Mon Sep 17 00:00:00 2001 From: kkinnunen Date: Thu, 19 Nov 2015 09:37:02 -0800 Subject: Fix GpuDrawPathTest on ANGLE and enable it Fix GpuDrawPathTest on ANGLE by avoiding a crash if MSAA surface creation fails. Enable the test. BUG=skia:4581 Review URL: https://codereview.chromium.org/1463493002 --- tests/GpuDrawPathTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/GpuDrawPathTest.cpp') diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp index ea3b3a7aed..42083fe08f 100644 --- a/tests/GpuDrawPathTest.cpp +++ b/tests/GpuDrawPathTest.cpp @@ -77,9 +77,6 @@ static void test_drawSameRectOvals(skiatest::Reporter*, SkCanvas* canvas) { } DEF_GPUTEST(GpuDrawPath, reporter, factory) { - // https://bugs.chromium.org/p/skia/issues/detail?id=4581 - return; - for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) { GrContextFactory::GLContextType glType = static_cast(type); @@ -95,6 +92,9 @@ DEF_GPUTEST(GpuDrawPath, reporter, factory) { SkAutoTUnref surface( SkSurface::NewRenderTarget(grContext, SkSurface::kNo_Budgeted, info, sampleCounts[i], nullptr)); + if (!surface) { + continue; + } test_drawPathEmpty(reporter, surface->getCanvas()); } } -- cgit v1.2.3