From 32342f032e1dfd133040324f851f0365f9d4cb51 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Sat, 4 Mar 2017 08:12:46 -0500 Subject: Rebase and fix chromium Combine texture provider and resource provider Largely mechanical. Only three places that were calling createApprox via texture provider (ie without flags), so that was simple. BUG=skia: Change-Id: I876367bcdc6a8db736deedab1028de1972015509 Reviewed-on: https://skia-review.googlesource.com/9176 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon --- tests/TestUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/TestUtils.cpp') diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp index 0e6e7b0d07..7ac18360da 100644 --- a/tests/TestUtils.cpp +++ b/tests/TestUtils.cpp @@ -107,7 +107,7 @@ void test_copy_to_surface(skiatest::Reporter* reporter, GrContext* context, copySrcDesc.fFlags = flags; sk_sp src(GrSurfaceProxy::MakeDeferred(*context->caps(), - context->textureProvider(), + context->resourceProvider(), copySrcDesc, SkBudgeted::kYes, pixels.get(), 0)); dstContext->copy(src.get()); -- cgit v1.2.3