Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: include/gpu/GrDrawContext.h

Issue 2347473007: Revert of Support Float32 output from SkColorSpaceXform (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/bench.gyp ('k') | src/codec/SkCodecPriv.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrDrawContext.h
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
index 5825b9238c66beb26fa2cb736948d610246b2e0f..29a70f9b14c19f50676e9952cce62092241e2522 100644
--- a/include/gpu/GrDrawContext.h
+++ b/include/gpu/GrDrawContext.h
@@ -33,7 +33,6 @@
class GrStyle;
class GrSurface;
struct GrUserStencilSettings;
-class SkColorSpaceXform;
class SkDrawFilter;
struct SkIPoint;
struct SkIRect;
@@ -336,7 +335,7 @@
}
const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
SkColorSpace* getColorSpace() const { return fColorSpace.get(); }
- SkColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); }
+ GrColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); }
GrSurfaceOrigin origin() const { return fRenderTarget->origin(); }
bool wasAbandoned() const;
@@ -417,22 +416,22 @@
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;
-
- sk_sp<SkColorSpace> fColorSpace;
- std::unique_ptr<SkColorSpaceXform> fColorXformFromSRGB;
- SkSurfaceProps fSurfaceProps;
- GrAuditTrail* fAuditTrail;
+ GrDrawTarget* fDrawTarget;
+ GrContext* fContext;
+ GrInstancedPipelineInfo fInstancedPipelineInfo;
+
+ sk_sp<SkColorSpace> fColorSpace;
+ sk_sp<GrColorSpaceXform> fColorXformFromSRGB;
+ SkSurfaceProps fSurfaceProps;
+ GrAuditTrail* fAuditTrail;
// In debug builds we guard against improper thread handling
- SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
+ SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
};
#endif
« no previous file with comments | « gyp/bench.gyp ('k') | src/codec/SkCodecPriv.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698