remove SkDeviceProperties

src/gpu/SkGpuDevice.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
@@ skipping 58 matching lines @@
     void clearAll();
 
     void replaceRenderTarget(bool shouldRetainContent);
 
     GrRenderTarget* accessRenderTarget() override;
 
     SkImageInfo imageInfo() const override {
         return fLegacyBitmap.info();
     }
 
-    const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
+    const SkSurfaceProps& surfaceProps() const {
+        return this->getLeakyProperties();

[bungeman-skia, 2015/06/19 17:35:34]

Does this make sense? The leaky properties are those properties which are set on
the device but the device doesn't know how to apply. The idea is that while the
device doesn't know how to apply these properties itself, other components can
sniff these and try to apply them as best they can.

In other words, when srgb support is added I would expect the leaky properties
to not be equal to the actual surface properties. Once there are no leaky
properties (all devices support linear or srgb properly and there's no text
gamma fiddling) then the leaky properties dance can go away.

[bungeman-skia, 2015/06/19 18:27:30]

Ah, so no one is using the leaky properties.

[robertphillips, 2015/06/19 18:27:47]

As discussed in person I will follow up this CL with another one that will
rename all of SkDevice's "leaky"-props instances\names with "surface"-props
variants.

+    }
 
     void drawPaint(const SkDraw&, const SkPaint& paint) override;
     virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
                             const SkPoint[], const SkPaint& paint) override;
     virtual void drawRect(const SkDraw&, const SkRect& r,
                           const SkPaint& paint) override;
     virtual void drawRRect(const SkDraw&, const SkRRect& r,
                            const SkPaint& paint) override;
     virtual void drawDRRect(const SkDraw& draw, const SkRRect& outer,
                             const SkRRect& inner, const SkPaint& paint) override;
@@ skipping 54 matching lines @@
     virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture,
                                           const SkMatrix*, const SkPaint*) override;
 
 private:
     GrContext*                      fContext;
     GrSkDrawProcs*                  fDrawProcs;
     SkAutoTUnref<const SkClipStack> fClipStack;
     SkIPoint                        fClipOrigin;
     GrClip                          fClip;
     SkAutoTUnref<GrDrawContext>     fDrawContext;
-    SkSurfaceProps                  fSurfaceProps;
     GrRenderTarget*                 fRenderTarget;
     // remove when our clients don't rely on accessBitmap()
     SkBitmap                        fLegacyBitmap;
     bool                            fNeedClear;
 
     SkGpuDevice(GrRenderTarget*, int width, int height, const SkSurfaceProps*, unsigned flags);
 
     SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
     SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
@@ skipping 49 matching lines @@
     bool drawDashLine(const SkPoint pts[2], const SkPaint& paint);
 
     static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
                                               int sampleCount);
 
     friend class GrAtlasTextContext;
     typedef SkBaseDevice INHERITED;
 };
 
 #endif