Remove GrContext::applyGamma

tests/ApplyGammaTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <initializer_list>
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
-#include "GrDrawContext.h"
-#include "GrTexture.h"
-#include "GrTextureProvider.h"
 
 #include "SkCanvas.h"
+#include "SkGammaColorFilter.h"
 #include "SkPixmap.h"
 #include "SkSurface.h"
 #include "SkUtils.h"
 
  // using anonymous namespace because these functions are used as template params.
 namespace {
 /** convert 0..1 linear value to 0..1 srgb */
 float linear_to_srgb(float linear) {
     if (linear <= 0.0031308) {
         return linear * 12.92f;
@@ skipping 78 matching lines @@
             if (!src || !dst) {
                 ERRORF(reporter, "Could not create surfaces for copy surface test.");
                 continue;
             }
 
             SkCanvas* dstCanvas = dst->getCanvas();
 
             dstCanvas->clear(SK_ColorRED);
             dstCanvas->flush();
 
-            // Temporary code until applyGamma is replaced
-            GrDrawContext* dc = dstCanvas->internal_private_accessTopLayerDrawContext();
-            GrRenderTarget* rt = dc->accessRenderTarget();
-            GrTexture* texture = src->getTexture();
-            SkASSERT(texture);
+            SkPaint gammaPaint;
+            gammaPaint.setXfermodeMode(SkXfermode::kSrc_Mode);
+            gammaPaint.setColorFilter(SkGammaColorFilter::Make(gamma));
 
-            bool result = context->applyGamma(rt, texture, gamma);
-
-            // To make the copied src rect correct we would apply any dst clipping
-            // back to the src rect, but we don't use it again so don't bother.
-            if (!result) {
-                ERRORF(reporter, "Unexpected failure from applyGamma.");
-                continue;
-            }
+            dstCanvas->drawImage(src, 0, 0, &gammaPaint);
+            dstCanvas->flush();
 
             sk_memset32(read.get(), 0, kW * kH);
             if (!dstCanvas->readPixels(ii, read.get(), kRowBytes, 0, 0)) {
                 ERRORF(reporter, "Error calling readPixels");
                 continue;
             }
 
             bool abort = false;
             // Validate that pixels were copied/transformed correctly.
             for (int y = 0; y < kH && !abort; ++y) {
                 for (int x = 0; x < kW && !abort; ++x) {
                     uint32_t r = read.get()[y * kW + x];
                     uint32_t s = srcPixels.get()[y * kW + x];
                     uint32_t expected;
                     if (!check_gamma(s, r, gamma, error, &expected)) {
                         ERRORF(reporter, "Expected dst %d,%d to contain 0x%08x "
                                 "from src 0x%08x and gamma %f. Got %08x",
                                 x, y, expected, s, gamma, r);
                         abort = true;
                         break;
                     }
                 }
             }
         }
     }
 }
 #endif