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

Unified Diff: include/gpu/GrTypesPriv.h

Issue 1002623004: Move GrAutoLocaleSetter to new file and fix issue with null locale (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove extra newline Created 5 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 | « gyp/gpu.gypi ('k') | src/gpu/GrAutoLocaleSetter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrTypesPriv.h
diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index 22b55bffa0dd53f83977373c6cf66ed8118279ec..412de897c6543b851dad3134020c0f9d1788deca 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -264,51 +264,4 @@ private:
SkIRect fRect;
};
-
-/**
- * Helper class for ensuring that we don't use the wrong locale when building shaders. Android
- * doesn't support locale in the NDK, so this is a no-op there.
- */
-#if !defined(SK_BUILD_FOR_ANDROID)
-#include <locale.h>
-#endif
-
-#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
-#include <xlocale.h>
-#endif
-
-class GrAutoLocaleSetter {
-public:
- GrAutoLocaleSetter (const char* name) {
-#if defined(SK_BUILD_FOR_WIN)
- fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
- fOldLocale = setlocale(LC_ALL, name);
-#elif !defined(SK_BUILD_FOR_ANDROID)
- fLocale = newlocale(LC_ALL, name, 0);
- fOldLocale = uselocale(fLocale);
-#else
- (void) name; // suppress unused param warning.
-#endif
- }
-
- ~GrAutoLocaleSetter () {
-#if defined(SK_BUILD_FOR_WIN)
- setlocale(LC_ALL, fOldLocale);
- _configthreadlocale(fOldPerThreadLocale);
-#elif !defined(SK_BUILD_FOR_ANDROID)
- uselocale(fOldLocale);
- freelocale(fLocale);
-#endif
- }
-
-private:
-#if defined(SK_BUILD_FOR_WIN)
- int fOldPerThreadLocale;
- const char* fOldLocale;
-#elif !defined(SK_BUILD_FOR_ANDROID)
- locale_t fOldLocale;
- locale_t fLocale;
-#endif
-};
-
#endif
« no previous file with comments | « gyp/gpu.gypi ('k') | src/gpu/GrAutoLocaleSetter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698