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

Unified Diff: src/core/SkDeviceProperties.h

Issue 1178383003: Revert of Make GrTextContext be owned by the GrDrawContext (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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 | « src/core/SkDevice.cpp ('k') | src/gpu/GrAtlasTextContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « src/core/SkDevice.cpp ('k') | src/gpu/GrAtlasTextContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698