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/OnFlushCallbackTest.cpp

diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index 568e5f2..70f44db 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -564,17 +564,17 @@
 DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(OnFlushCallbackTest, reporter, ctxInfo) {
     static const int kNumViews = 3;
 
-    auto dContext = ctxInfo.directContext();
-    auto proxyProvider = dContext->priv().proxyProvider();
+    auto context = ctxInfo.directContext();
+    auto proxyProvider = context->priv().proxyProvider();
 
     AtlasObject object(reporter);
 
-    dContext->priv().addOnFlushCallbackObject(&object);
+    context->priv().addOnFlushCallbackObject(&object);
 
     GrSurfaceProxyView views[kNumViews];
     for (int i = 0; i < kNumViews; ++i) {
-        views[i] = make_upstream_image(dContext, &object, i * 3,
-                                       object.getAtlasView(proxyProvider, dContext->priv().caps()),
+        views[i] = make_upstream_image(context, &object, i * 3,
+                                       object.getAtlasView(proxyProvider, context->priv().caps()),
                                        kPremul_SkAlphaType);
     }
 
@@ -582,7 +582,7 @@
     static const int kFinalHeight = kDrawnTileSize;
 
     auto rtc = GrRenderTargetContext::Make(
-            dContext, GrColorType::kRGBA_8888, nullptr, SkBackingFit::kApprox,
+            context, GrColorType::kRGBA_8888, nullptr, SkBackingFit::kApprox,
             {kFinalWidth, kFinalHeight});
 
     rtc->clear(SK_PMColor4fWHITE);
@@ -606,10 +606,11 @@
     SkBitmap readBack;
     readBack.allocN32Pixels(kFinalWidth, kFinalHeight);
 
-    SkAssertResult(rtc->readPixels(dContext, readBack.info(), readBack.getPixels(),
-                                   readBack.rowBytes(), {0, 0}));
+    SkDEBUGCODE(bool result =) rtc->readPixels(readBack.info(), readBack.getPixels(),
+                                               readBack.rowBytes(), {0, 0});
+    SkASSERT(result);
 
-    dContext->priv().testingOnly_flushAndRemoveOnFlushCallbackObject(&object);
+    context->priv().testingOnly_flushAndRemoveOnFlushCallbackObject(&object);
 
     object.markAsDone();