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

Unified Diff: chrome/renderer/renderer_webkitclient_impl.h

Issue 2846018: Revert "Mac: Infrastructure for serialization of OS fonts over IPC." (Closed)
Patch Set: Created 10 years, 6 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
« no previous file with comments | « chrome/common/font_loader_mac.h ('k') | chrome/renderer/renderer_webkitclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/renderer_webkitclient_impl.h
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 86fdf1ffb51be5ad872d99f4641344ae07c579b4..17e706f3fa3deefdd2746c743df26a31573563c3 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -20,8 +20,6 @@
#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 {
@@ -115,11 +113,6 @@ 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.
@@ -130,8 +123,9 @@ 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
« no previous file with comments | « chrome/common/font_loader_mac.h ('k') | chrome/renderer/renderer_webkitclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698