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

Unified Diff: include/utils/SkRTConf.h

Issue 444303002: Migrate SkRTConfRegistry test to DEF_TEST(). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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 | src/utils/SkRTConf.cpp » ('j') | tests/RTConfRegistryTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/utils/SkRTConf.h
diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h
index 4ba607011dd6f8acb900da5165f76d135b8d32c5..ad7f2c80f0f7693d372aa3bf894e2a87c13882a3 100644
--- a/include/utils/SkRTConf.h
+++ b/include/utils/SkRTConf.h
@@ -84,21 +84,20 @@ public:
template <typename T> void set(const char *confname,
T value,
bool warnIfNotFound = true);
-#ifdef SK_SUPPORT_UNITTEST
- static void UnitTest();
-#endif
+ template <typename T> bool parse(const char *name, T* value);
tfarina 2014/08/07 03:05:40 I know you won't like this ;/
mtklein 2014/08/07 12:26:14 Seems fine, but let's keep it private and instead
tfarina 2014/08/07 14:11:27 Hum, who do I do that?
+
private:
template<typename T> friend class SkRTConf;
+#ifdef SK_SUPPORT_UNITTEST
+ SkRTConfRegistry();
tfarina 2014/08/07 03:05:40 you will probably want me to keep the bool paramet
mtklein 2014/08/07 12:26:14 I don't think so? If this test works as written,
tfarina 2014/08/07 14:11:27 Done.
+#endif
+
void registerConf(SkRTConfBase *conf);
- template <typename T> bool parse(const char *name, T* value);
SkTDArray<SkString *> fConfigFileKeys, fConfigFileValues;
typedef SkTDict< SkTDArray<SkRTConfBase *> * > ConfMap;
ConfMap fConfs;
-#ifdef SK_SUPPORT_UNITTEST
- SkRTConfRegistry(bool);
-#endif
};
// our singleton registry
« no previous file with comments | « no previous file | src/utils/SkRTConf.cpp » ('j') | tests/RTConfRegistryTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698