| Index: src/core/SkDeviceProperties.h
|
| diff --git a/src/core/SkDeviceProperties.h b/src/core/SkDeviceProperties.h
|
| index 85f87bcb868565d73bd2d22ada503d874f21c500..e79f21a2350f1e4b958c73c66e631562cc99be87 100644
|
| --- a/src/core/SkDeviceProperties.h
|
| +++ b/src/core/SkDeviceProperties.h
|
| @@ -11,12 +11,11 @@
|
| #include "SkSurfacePriv.h"
|
|
|
| struct SkDeviceProperties {
|
| - SkDeviceProperties(const SkDeviceProperties& src)
|
| - : fGamma(src.fGamma)
|
| - , fPixelGeometry(src.fPixelGeometry) {
|
| - }
|
| + enum InitType {
|
| + kLegacyLCD_InitType
|
| + };
|
|
|
| - SkDeviceProperties(float gamma = SK_GAMMA_EXPONENT)
|
| + SkDeviceProperties(InitType, float gamma = SK_GAMMA_EXPONENT)
|
| : fGamma(gamma)
|
| , fPixelGeometry(SkSurfacePropsDefaultPixelGeometry())
|
| {}
|
| @@ -26,15 +25,15 @@
|
| , fPixelGeometry(geo)
|
| {}
|
|
|
| + SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
|
| float gamma() const { return fGamma; }
|
| - SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
|
|
|
| void setPixelGeometry(SkPixelGeometry geo) {
|
| fPixelGeometry = geo;
|
| }
|
|
|
| private:
|
| - const float fGamma;
|
| + const float fGamma;
|
| SkPixelGeometry fPixelGeometry;
|
| };
|
|
|
|
|