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

Unified Diff: skia/ext/SkFontHost_fontconfig_direct.h

Issue 3522004: FBTF: Move ctors/dtors into implementation files. Adds ctors/dtors to non-POD structs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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
Index: skia/ext/SkFontHost_fontconfig_direct.h
diff --git a/skia/ext/SkFontHost_fontconfig_direct.h b/skia/ext/SkFontHost_fontconfig_direct.h
index e338633c45bff0af752189e726eac98e5ac6449f..c4ffb6cb71c1d06573c7734a3a9d9d35e96a17a7 100644
--- a/skia/ext/SkFontHost_fontconfig_direct.h
+++ b/skia/ext/SkFontHost_fontconfig_direct.h
@@ -26,23 +26,24 @@
#include "SkFontHost_fontconfig_impl.h"
class FontConfigDirect : public FontConfigInterface {
- public:
- FontConfigDirect();
+ public:
+ FontConfigDirect();
+ virtual ~FontConfigDirect();
- // FontConfigInterface implementation. Thread safe.
- virtual bool Match(std::string* result_family, unsigned* result_filefaceid,
- bool filefaceid_valid, unsigned filefaceid,
- const std::string& family,
- const void* characters, size_t characters_bytes,
- bool* is_bold, bool* is_italic);
- virtual int Open(unsigned filefaceid);
+ // FontConfigInterface implementation. Thread safe.
+ virtual bool Match(std::string* result_family, unsigned* result_filefaceid,
+ bool filefaceid_valid, unsigned filefaceid,
+ const std::string& family,
+ const void* characters, size_t characters_bytes,
+ bool* is_bold, bool* is_italic);
+ virtual int Open(unsigned filefaceid);
- private:
- SkMutex mutex_;
- // fileid stored in two maps below are unique per font file.
- std::map<unsigned, std::string> fileid_to_filename_;
- std::map<std::string, unsigned> filename_to_fileid_;
- unsigned next_file_id_;
+ private:
+ SkMutex mutex_;
+ // fileid stored in two maps below are unique per font file.
+ std::map<unsigned, std::string> fileid_to_filename_;
+ std::map<std::string, unsigned> filename_to_fileid_;
+ unsigned next_file_id_;
};
#endif // FontConfigDirect_DEFINED

Powered by Google App Engine
This is Rietveld 408576698