commit 16d8ec66cdce2f30ce89b87066d3ac7a244c460d
author Robert Phillips <robertphillips@google.com> Thu Jul 27 16:16:25 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 27 22:16:06 2017 +0000
tree c1428954ad363f7e2b6ce13bbb1640911c7a8262
parent 713195071dc7bdeddec2d1c9fab9b3720f049f07

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 <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/TestUtils.cpp

diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index aca7509..f608413 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -70,9 +70,9 @@
                             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 @@
     }
 
     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;