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

Unified Diff: include/core/SkCanvas.h

Issue 205963003: Revert "hide Config8888 entirely". Broke a bunch of builds. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | include/core/SkColorPriv.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 71ce85791f05beb8f9a9a1b595166877c5e18cb6..fa433b38b78c3d76ec9148e565eb99fa8a2f92de 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -20,12 +20,6 @@
//#define SK_SUPPORT_LEGACY_READPIXELSCONFIG
-#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG
- #ifndef SK_SUPPORT_LEGACY_CONFIG8888
- #define SK_SUPPORT_LEGACY_CONFIG8888
- #endif
-#endif
-
// if not defined, we always assume ClipToLayer for saveLayer()
//#define SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
@@ -237,7 +231,6 @@ public:
*/
const void* peekPixels(SkImageInfo* info, size_t* rowBytes);
-#ifdef SK_SUPPORT_LEGACY_CONFIG8888
/**
* This enum can be used with read/writePixels to perform a pixel ops to or
* from an 8888 config other than Skia's native config (SkPMColor). There
@@ -272,7 +265,6 @@ public:
kRGBA_Premul_Config8888,
kRGBA_Unpremul_Config8888
};
-#endif
#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG
/**
« no previous file with comments | « no previous file | include/core/SkColorPriv.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698