commit cf0d08e149cfea45b2bc70ec22181315d33ddb3f
author Adlai Holler <adlai@google.com> Tue Aug 11 12:36:10 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 11 12:36:27 2020 +0000
tree de0d98a1b75c0ee4d6ee4f14a4dd74826a22e563
parent 109ff207de7d7846ec9ddcd4230dac47814b2aea

Revert "Migrate GrSurfaceContext readPixels to take direct context"

This reverts commit d169e1915cba8caaddabb22b3672c7cefa91bfa2.

Reason for revert: broke chrome via code generator

Original change's description:
> Migrate GrSurfaceContext readPixels to take direct context
> 
> After this lands we'll proceed up the stack and add the direct
> context requirement to the public API and SkImage.
> 
> Bug: skia:104662
> Change-Id: I4b2d779a7fcd65eec68e631757821ac8e136ddba
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309044
> Commit-Queue: Adlai Holler <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=robertphillips@google.com,adlai@google.com

Change-Id: I6126f2dca4bc902c903512ac486e22841cc472e5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:104662
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309281
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>

tests/GrTestingBackendTextureUploadTest.cpp

diff --git a/tests/GrTestingBackendTextureUploadTest.cpp b/tests/GrTestingBackendTextureUploadTest.cpp
index 5aa1c50..c271861 100644
--- a/tests/GrTestingBackendTextureUploadTest.cpp
+++ b/tests/GrTestingBackendTextureUploadTest.cpp
@@ -80,10 +80,9 @@
                                                  kPremul_SkAlphaType, nullptr);
     REPORTER_ASSERT(reporter, surfaceContext);
 
-    bool result = surfaceContext->readPixels(dContext,
-                                             {grCT, kPremul_SkAlphaType, nullptr, kWidth, kHeight},
+    bool result = surfaceContext->readPixels({grCT, kPremul_SkAlphaType, nullptr, kWidth, kHeight},
                                              actualPixels.writable_addr(), actualPixels.rowBytes(),
-                                             {0, 0});
+                                             {0, 0}, dContext);
 
     REPORTER_ASSERT(reporter, result);
     REPORTER_ASSERT(reporter,