remove SkDeviceProperties

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
 
 #include "GrColor.h"
 #include "SkRefCnt.h"
+#include "SkSurfaceProps.h"
 
 class GrBatch;
 class GrClip;
 class GrContext;
 class GrDrawTarget;
 class GrPaint;
 class GrPathProcessor;
 class GrPathRange;
 class GrPipelineBuilder;
 class GrRenderTarget;
 class GrStrokeInfo;
 class GrSurface;
 class GrTextContext;
-struct SkDeviceProperties;
 class SkDrawFilter;
 struct SkIPoint;
 struct SkIRect;
 class SkMatrix;
 class SkPaint;
 class SkPath;
 struct SkPoint;
 struct SkRect;
 class SkRRect;
 class SkTextBlob;
@@ skipping 200 matching lines @@
                   const GrPaint& paint,
                   const SkMatrix& viewMatrix,
                   const SkRect& oval,
                   const GrStrokeInfo& strokeInfo);
 
 
 private:
     friend class GrAtlasTextContext; // for access to drawBatch
     friend class GrContext; // for ctor
 
-    GrDrawContext(GrContext*, GrDrawTarget*, const SkDeviceProperties&);
+    GrDrawContext(GrContext*, GrDrawTarget*, const SkSurfaceProps&);
 
     // Sets the paint. Returns true on success; false on failure.
     bool prepareToDraw(GrPipelineBuilder*,
                        GrRenderTarget* rt,
                        const GrClip&,
                        const GrPaint* paint);
-    GrTextContext* createTextContext(GrRenderTarget*, const SkDeviceProperties&);
+    GrTextContext* createTextContext(GrRenderTarget*, const SkSurfaceProps&);
 
     // A simpler version of the above which just returns true on success; false on failure.  
     // Clip is *NOT* set
     bool prepareToDraw(GrRenderTarget* rt);
 
     void internalDrawPath(GrDrawTarget*,
                           GrPipelineBuilder*,
                           const SkMatrix& viewMatrix,
                           GrColor,
                           bool useAA,
                           const SkPath&,
                           const GrStrokeInfo&);
 
     // This entry point allows the GrTextContext-derived classes to add their batches to
     // the drawTarget.
     void drawBatch(GrPipelineBuilder* pipelineBuilder, GrBatch* batch);
 
     GrContext*          fContext;     // owning context -> no ref
     GrDrawTarget*       fDrawTarget;
     GrTextContext*      fTextContext; // lazily created
 
-    SkDeviceProperties* fDevProps;    // ptr b.c. SkDeviceProperties isn't public
+    SkSurfaceProps      fSurfaceProps;
 };
 
 #endif