diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 20:06:30 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 20:06:30 +0000 |
commit | 20f0487a5b73e8071af2612150301b0942cbf0e2 (patch) | |
tree | ecee69b28f16712bdc1558ac0a015ac80095c761 /skia | |
parent | 167b0dd17d5ed57ff293b6480ccaed706e0bc9cb (diff) | |
download | chromium_src-20f0487a5b73e8071af2612150301b0942cbf0e2.zip chromium_src-20f0487a5b73e8071af2612150301b0942cbf0e2.tar.gz chromium_src-20f0487a5b73e8071af2612150301b0942cbf0e2.tar.bz2 |
FBTF: Move ctors/dtors into implementation files. Adds ctors/dtors to non-POD structs.
Cuts ~2MB off our .a files (Debug, Linux). Also added the "virtual" keyword on
a whole bunch of virtual dtors that were missing it.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3522004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.cpp | 3 | ||||
-rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.h | 31 |
2 files changed, 19 insertions, 15 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.cpp b/skia/ext/SkFontHost_fontconfig_direct.cpp index 47b89653..adaddf9 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.cpp +++ b/skia/ext/SkFontHost_fontconfig_direct.cpp @@ -106,6 +106,9 @@ FontConfigDirect::FontConfigDirect() FcInit(); } +FontConfigDirect::~FontConfigDirect() { +} + // ----------------------------------------------------------------------------- // Normally we only return exactly the font asked for. In last-resort // cases, the request either doesn't specify a font or is one of the diff --git a/skia/ext/SkFontHost_fontconfig_direct.h b/skia/ext/SkFontHost_fontconfig_direct.h index e338633..c4ffb6c 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 |