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

Unified Diff: content/child/dwrite_font_proxy/dwrite_font_proxy_win.h

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/child/dwrite_font_proxy/dwrite_font_proxy_win.h
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
index 555876026d1c4c8d7b2046ec25de7bea7772743d..a46928d50e6de0ed830cda02bbce7d12b5c2c862 100644
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
@@ -8,6 +8,7 @@
#include <dwrite.h>
#include <wrl.h>
+#include <deque>
#include <map>
#include <vector>
@@ -164,13 +165,12 @@ class CONTENT_EXPORT FontFileEnumerator
HRESULT STDMETHODCALLTYPE
RuntimeClassInitialize(IDWriteFactory* factory,
IDWriteFontFileLoader* loader,
- std::vector<base::string16>* file_names);
+ std::vector<HANDLE>* files);
private:
Microsoft::WRL::ComPtr<IDWriteFactory> factory_;
Microsoft::WRL::ComPtr<IDWriteFontFileLoader> loader_;
- std::vector<base::string16> file_names_;
- std::vector<Microsoft::WRL::ComPtr<IDWriteFontFileStream>> file_streams_;
+ std::vector<HANDLE> files_;
UINT32 next_file_ = 0;
UINT32 current_file_ = UINT_MAX;
@@ -197,8 +197,7 @@ class CONTENT_EXPORT FontFileStream
void** fragment_context) override;
void STDMETHODCALLTYPE ReleaseFileFragment(void* fragment_context) override {}
- HRESULT STDMETHODCALLTYPE
- RuntimeClassInitialize(const base::string16& file_name);
+ HRESULT STDMETHODCALLTYPE RuntimeClassInitialize(HANDLE handle);
private:
base::MemoryMappedFile data_;

Powered by Google App Engine
This is Rietveld 408576698