Support Float32 output from SkColorSpaceXform

include/gpu/GrDrawContext.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawContext_DEFINED
 #define GrDrawContext_DEFINED
 
@@ skipping 15 matching lines @@
 class GrDrawingManager;
 class GrDrawTarget;
 class GrFixedClip;
 class GrPaint;
 class GrPathProcessor;
 class GrPipelineBuilder;
 class GrRenderTarget;
 class GrStyle;
 class GrSurface;
 struct GrUserStencilSettings;
+class SkColorSpaceXform;

[msarett, 2016/09/14 20:20:35]

Brian, we can back out the gpu parts of this change depending on what you think.
 Mostly I was looking for a way to test.  But I think I'm going to write
additional tests anyway.

 class SkDrawFilter;
 struct SkIPoint;
 struct SkIRect;
 class SkLatticeIter;
 class SkMatrix;
 class SkPaint;
 class SkPath;
 struct SkPoint;
 struct SkRect;
 class SkRRect;
@@ skipping 282 matching lines @@
     int height() const { return fRenderTarget->height(); }
     GrPixelConfig config() const { return fRenderTarget->config(); }
     int numColorSamples() const { return fRenderTarget->numColorSamples(); }
     bool isGammaCorrect() const { return SkToBool(fColorSpace.get()); }
     SkSourceGammaTreatment sourceGammaTreatment() const {
         return this->isGammaCorrect() ? SkSourceGammaTreatment::kRespect
                                       : SkSourceGammaTreatment::kIgnore;
     }
     const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
     SkColorSpace* getColorSpace() const { return fColorSpace.get(); }
-    GrColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); }
+    SkColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); }
     GrSurfaceOrigin origin() const { return fRenderTarget->origin(); }
 
     bool wasAbandoned() const;
 
     GrRenderTarget* accessRenderTarget() { return fRenderTarget.get(); }
 
     sk_sp<GrTexture> asTexture() { return sk_ref_sp(fRenderTarget->asTexture()); }
 
     // Provides access to functions that aren't part of the public API.
     GrDrawContextPriv drawContextPriv();
@@ skipping 60 matching lines @@
                           const SkMatrix& viewMatrix,
                           const SkPath& path,
                           const GrStyle& style);
 
     // This entry point allows the GrTextContext-derived classes to add their batches to
     // the drawTarget.
     void drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip&, GrDrawBatch* batch);
 
     GrDrawTarget* getDrawTarget();
 
-    GrDrawingManager*                 fDrawingManager;
-    sk_sp<GrRenderTarget>             fRenderTarget;
+    GrDrawingManager*                  fDrawingManager;
+    sk_sp<GrRenderTarget>              fRenderTarget;
 
     // In MDB-mode the drawTarget can be closed by some other drawContext that has picked
     // it up. For this reason, the drawTarget should only ever be accessed via 'getDrawTarget'.
-    GrDrawTarget*                     fDrawTarget;
-    GrContext*                        fContext;
-    GrInstancedPipelineInfo           fInstancedPipelineInfo;
+    GrDrawTarget*                      fDrawTarget;
+    GrContext*                         fContext;
+    GrInstancedPipelineInfo            fInstancedPipelineInfo;
 
-    sk_sp<SkColorSpace>               fColorSpace;
-    sk_sp<GrColorSpaceXform>          fColorXformFromSRGB;
-    SkSurfaceProps                    fSurfaceProps;
-    GrAuditTrail*                     fAuditTrail;
+    sk_sp<SkColorSpace>                fColorSpace;
+    std::unique_ptr<SkColorSpaceXform> fColorXformFromSRGB;
+    SkSurfaceProps                     fSurfaceProps;
+    GrAuditTrail*                      fAuditTrail;
 
     // In debug builds we guard against improper thread handling
-    SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
+    SkDEBUGCODE(mutable GrSingleOwner*  fSingleOwner;)
 };
 
 #endif