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

Side by Side 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, 2 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 unified diff | Download patch
OLDNEW
1 /* libs/graphics/ports/SkFontHost_fontconfig_direct.h 1 /* libs/graphics/ports/SkFontHost_fontconfig_direct.h
2 ** 2 **
3 ** Copyright 2009, Google Inc. 3 ** Copyright 2009, Google Inc.
4 ** 4 **
5 ** Licensed under the Apache License, Version 2.0 (the "License"); 5 ** Licensed under the Apache License, Version 2.0 (the "License");
6 ** you may not use this file except in compliance with the License. 6 ** you may not use this file except in compliance with the License.
7 ** You may obtain a copy of the License at 7 ** You may obtain a copy of the License at
8 ** 8 **
9 ** http://www.apache.org/licenses/LICENSE-2.0 9 ** http://www.apache.org/licenses/LICENSE-2.0
10 ** 10 **
11 ** Unless required by applicable law or agreed to in writing, software 11 ** Unless required by applicable law or agreed to in writing, software
12 ** distributed under the License is distributed on an "AS IS" BASIS, 12 ** distributed under the License is distributed on an "AS IS" BASIS,
13 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 ** See the License for the specific language governing permissions and 14 ** See the License for the specific language governing permissions and
15 ** limitations under the License. 15 ** limitations under the License.
16 */ 16 */
17 17
18 #ifndef FontConfigDirect_DEFINED 18 #ifndef FontConfigDirect_DEFINED
19 #define FontConfigDirect_DEFINED 19 #define FontConfigDirect_DEFINED
20 #pragma once 20 #pragma once
21 21
22 #include <map> 22 #include <map>
23 #include <string> 23 #include <string>
24 24
25 #include "SkThread.h" 25 #include "SkThread.h"
26 #include "SkFontHost_fontconfig_impl.h" 26 #include "SkFontHost_fontconfig_impl.h"
27 27
28 class FontConfigDirect : public FontConfigInterface { 28 class FontConfigDirect : public FontConfigInterface {
29 public: 29 public:
30 FontConfigDirect(); 30 FontConfigDirect();
31 virtual ~FontConfigDirect();
31 32
32 // FontConfigInterface implementation. Thread safe. 33 // FontConfigInterface implementation. Thread safe.
33 virtual bool Match(std::string* result_family, unsigned* result_filefaceid, 34 virtual bool Match(std::string* result_family, unsigned* result_filefaceid,
34 bool filefaceid_valid, unsigned filefaceid, 35 bool filefaceid_valid, unsigned filefaceid,
35 const std::string& family, 36 const std::string& family,
36 const void* characters, size_t characters_bytes, 37 const void* characters, size_t characters_bytes,
37 bool* is_bold, bool* is_italic); 38 bool* is_bold, bool* is_italic);
38 virtual int Open(unsigned filefaceid); 39 virtual int Open(unsigned filefaceid);
39 40
40 private: 41 private:
41 SkMutex mutex_; 42 SkMutex mutex_;
42 // fileid stored in two maps below are unique per font file. 43 // fileid stored in two maps below are unique per font file.
43 std::map<unsigned, std::string> fileid_to_filename_; 44 std::map<unsigned, std::string> fileid_to_filename_;
44 std::map<std::string, unsigned> filename_to_fileid_; 45 std::map<std::string, unsigned> filename_to_fileid_;
45 unsigned next_file_id_; 46 unsigned next_file_id_;
46 }; 47 };
47 48
48 #endif // FontConfigDirect_DEFINED 49 #endif // FontConfigDirect_DEFINED
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698