diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-20 06:54:00 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-20 06:54:00 +0000 |
| commit | bce61677147749792bf45b63acedb406125792e1 (patch) | |
| tree | bb86c271405aa1482c67ad5c92bdc0f1c3f9fd4e /chrome/renderer/renderer_webkitclient_impl.h | |
| parent | db42ae05e7e08e3845900f45c711a3f02879bbd6 (diff) | |
| download | chromium_src-bce61677147749792bf45b63acedb406125792e1.zip chromium_src-bce61677147749792bf45b63acedb406125792e1.tar.gz chromium_src-bce61677147749792bf45b63acedb406125792e1.tar.bz2 | |
Re-commit r50321 after rollback.
Mac: Infrastructure for serialization of OS fonts over IPC. Renderer & Browser bits to send and receive IPC message for OOP font loading.
Review URL: http://codereview.chromium.org/2841019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_webkitclient_impl.h')
| -rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h index 17e706f..86fdf1f 100644 --- a/chrome/renderer/renderer_webkitclient_impl.h +++ b/chrome/renderer/renderer_webkitclient_impl.h @@ -20,6 +20,8 @@ #include <map> #include "base/lock.h" #include "third_party/WebKit/WebKit/chromium/public/linux/WebSandboxSupport.h" +#elif defined(OS_MACOSX) +#include "third_party/WebKit/WebKit/chromium/public/mac/WebSandboxSupport.h" #endif namespace IPC { @@ -113,6 +115,11 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl { Lock unicode_font_families_mutex_; std::map<std::string, std::string> unicode_font_families_; }; +#elif defined(OS_MACOSX) + class SandboxSupport : public WebKit::WebSandboxSupport { + public: + virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out); + }; #endif // Helper function to send synchronous message from any thread. @@ -123,9 +130,8 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl { FileSystem file_system_; MimeRegistry mime_registry_; -#if defined(OS_WIN) || defined(OS_LINUX) + SandboxSupport sandbox_support_; -#endif // This counter keeps track of the number of times sudden termination is // enabled or disabled. It starts at 0 (enabled) and for every disable |