| 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..d6115cdab6e430c31ae085e68d61c906cfd22030 100644
|
| --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
|
| +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
|
| @@ -164,13 +164,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 +196,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_;
|
|
|