From 16d8ec66cdce2f30ce89b87066d3ac7a244c460d Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Thu, 27 Jul 2017 16:16:25 -0400 Subject: Pull non-substantive changes out of omnibus GrSurface CL https://skia-review.googlesource.com/c/26363 (Remove origin field from GrSurface) is already too large. This pulls some of the cosmetic changes out for separate review. Change-Id: I1d8b95522144b2f4cbd916ef38faa3dde6f78087 Reviewed-on: https://skia-review.googlesource.com/27840 Reviewed-by: Brian Salomon Commit-Queue: Robert Phillips --- tests/TestUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/TestUtils.cpp') diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp index aca7509748..f60841384c 100644 --- a/tests/TestUtils.cpp +++ b/tests/TestUtils.cpp @@ -70,9 +70,9 @@ void test_copy_from_surface(skiatest::Reporter* reporter, GrContext* context, GrSurfaceProxy* proxy, uint32_t expectedPixelValues[], bool onlyTestRTConfig, const char* testName) { GrSurfaceDesc copyDstDesc; - copyDstDesc.fConfig = kRGBA_8888_GrPixelConfig; copyDstDesc.fWidth = proxy->width(); copyDstDesc.fHeight = proxy->height(); + copyDstDesc.fConfig = kRGBA_8888_GrPixelConfig; for (auto flags : { kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag }) { if (kNone_GrSurfaceFlags == flags && onlyTestRTConfig) { @@ -102,9 +102,9 @@ void test_copy_to_surface(skiatest::Reporter* reporter, GrResourceProvider* reso } GrSurfaceDesc copySrcDesc; - copySrcDesc.fConfig = kRGBA_8888_GrPixelConfig; copySrcDesc.fWidth = dstContext->width(); copySrcDesc.fHeight = dstContext->height(); + copySrcDesc.fConfig = kRGBA_8888_GrPixelConfig; for (auto flags : { kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag }) { copySrcDesc.fFlags = flags; -- cgit v1.2.3