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

Unified Diff: include/core/SkBitmap.h

Issue 301283003: Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add guard for android Created 6 years, 7 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 | « gyp/skia_for_chromium_defines.gypi ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index b487285d9380915eedbb04c2f636585c373b09d5..a6acb8713e4bc04aaac4cc565cb24d7249dd3330 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -276,7 +276,13 @@ public:
kPremul_SkAlphaType);
}
- bool setConfig(const SkImageInfo& info, size_t rowBytes = 0);
+ bool setInfo(const SkImageInfo&, size_t rowBytes = 0);
+
+#ifdef SK_SUPPORT_LEGACY_SETCONFIG_INFO
+ bool setConfig(const SkImageInfo& info, size_t rowBytes = 0) {
+ return this->setInfo(info, rowBytes);
+ }
+#endif
/**
* Allocate a pixelref to match the specified image info. If the Factory
« no previous file with comments | « gyp/skia_for_chromium_defines.gypi ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698