OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h" | 5 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 const char* preferred_locale, | 111 const char* preferred_locale, |
112 blink::WebFallbackFont* fallbackFont) { | 112 blink::WebFallbackFont* fallbackFont) { |
113 ppapi::ProxyLock::AssertAcquired(); | 113 ppapi::ProxyLock::AssertAcquired(); |
114 // For debugging crbug.com/312965 | 114 // For debugging crbug.com/312965 |
115 CHECK_EQ(creation_thread_, base::PlatformThread::CurrentId()); | 115 CHECK_EQ(creation_thread_, base::PlatformThread::CurrentId()); |
116 const std::map<int32_t, blink::WebFallbackFont>::const_iterator iter = | 116 const std::map<int32_t, blink::WebFallbackFont>::const_iterator iter = |
117 unicode_font_families_.find(character); | 117 unicode_font_families_.find(character); |
118 if (iter != unicode_font_families_.end()) { | 118 if (iter != unicode_font_families_.end()) { |
119 fallbackFont->name = iter->second.name; | 119 fallbackFont->name = iter->second.name; |
120 fallbackFont->filename = iter->second.filename; | 120 fallbackFont->filename = iter->second.filename; |
| 121 fallbackFont->fontconfigInterfaceId = iter->second.fontconfigInterfaceId; |
121 fallbackFont->ttcIndex = iter->second.ttcIndex; | 122 fallbackFont->ttcIndex = iter->second.ttcIndex; |
122 fallbackFont->isBold = iter->second.isBold; | 123 fallbackFont->isBold = iter->second.isBold; |
123 fallbackFont->isItalic = iter->second.isItalic; | 124 fallbackFont->isItalic = iter->second.isItalic; |
124 return; | 125 return; |
125 } | 126 } |
126 | 127 |
127 GetFallbackFontForCharacter(character, preferred_locale, fallbackFont); | 128 GetFallbackFontForCharacter(character, preferred_locale, fallbackFont); |
128 unicode_font_families_.insert(std::make_pair(character, *fallbackFont)); | 129 unicode_font_families_.insert(std::make_pair(character, *fallbackFont)); |
129 } | 130 } |
130 | 131 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 NOTREACHED(); | 252 NOTREACHED(); |
252 } | 253 } |
253 | 254 |
254 int PpapiWebKitPlatformSupportImpl::databaseDeleteFile( | 255 int PpapiWebKitPlatformSupportImpl::databaseDeleteFile( |
255 const blink::WebString& vfs_file_name, bool sync_dir) { | 256 const blink::WebString& vfs_file_name, bool sync_dir) { |
256 NOTREACHED(); | 257 NOTREACHED(); |
257 return 0; | 258 return 0; |
258 } | 259 } |
259 | 260 |
260 } // namespace content | 261 } // namespace content |
OLD | NEW |