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

Unified Diff: content/test/dwrite_font_fake_sender_win.cc

Issue 2153343002: Implement support for loading font files from outside system directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test patchset to run try job Created 4 years, 5 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: content/test/dwrite_font_fake_sender_win.cc
diff --git a/content/test/dwrite_font_fake_sender_win.cc b/content/test/dwrite_font_fake_sender_win.cc
index a525ee6a23618eb0c61777bbfcb657a9bd9070c0..c5e649a0e8bf812dfcf3f31ba5500fef3e488f37 100644
--- a/content/test/dwrite_font_fake_sender_win.cc
+++ b/content/test/dwrite_font_fake_sender_win.cc
@@ -109,8 +109,9 @@ void FakeFontCollection::ReplySender::OnGetFamilyNames(
void FakeFontCollection::ReplySender::OnGetFontFiles(
uint32_t family_index,
- std::vector<base::string16>* file_paths) {
- collection_->OnGetFontFiles(family_index, file_paths);
+ std::vector<base::string16>* file_paths,
+ std::vector<uint32_t>* file_handles) {
+ collection_->OnGetFontFiles(family_index, file_paths, file_handles);
}
void FakeFontCollection::ReplySender::OnMapCharacters(
@@ -170,12 +171,13 @@ void FakeFontCollection::OnGetFamilyNames(
*family_names = fonts_[family_index].family_names_;
}
-void FakeFontCollection::OnGetFontFiles(
- uint32_t family_index,
- std::vector<base::string16>* file_paths) {
+void FakeFontCollection::OnGetFontFiles(uint32_t family_index,
+ std::vector<base::string16>* file_paths,
+ std::vector<uint32_t>* file_handles) {
if (family_index >= fonts_.size())
return;
*file_paths = fonts_[family_index].file_paths_;
+ *file_handles = fonts_[family_index].file_handles_;
}
void FakeFontCollection::OnMapCharacters(const base::string16& text,

Powered by Google App Engine
This is Rietveld 408576698