| Index: content/common/frame_messages.h
|
| diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
|
| index 7a01df4c10ff38778bad7b3ce0017f234d82498e..48c491722c7a62fc1a56c2c422b9fed1ab2afbe8 100644
|
| --- a/content/common/frame_messages.h
|
| +++ b/content/common/frame_messages.h
|
| @@ -5,7 +5,6 @@
|
| // IPC messages for interacting with frames.
|
| // Multiply-included message file, hence no include guard.
|
|
|
| -#include "base/memory/shared_memory.h"
|
| #include "cc/surfaces/surface_id.h"
|
| #include "cc/surfaces/surface_sequence.h"
|
| #include "content/common/content_export.h"
|
| @@ -33,10 +32,6 @@
|
| #include "url/gurl.h"
|
| #include "url/origin.h"
|
|
|
| -#if defined(OS_MACOSX)
|
| -#include "content/common/mac/font_descriptor.h"
|
| -#endif
|
| -
|
| #if defined(ENABLE_PLUGINS)
|
| #include "content/common/pepper_renderer_instance_data.h"
|
| #endif
|
| @@ -422,13 +417,6 @@ IPC_STRUCT_BEGIN(FrameHostMsg_ShowPopup_Params)
|
| IPC_STRUCT_END()
|
| #endif
|
|
|
| -#if defined(OS_MACOSX)
|
| -IPC_STRUCT_TRAITS_BEGIN(FontDescriptor)
|
| - IPC_STRUCT_TRAITS_MEMBER(font_name)
|
| - IPC_STRUCT_TRAITS_MEMBER(font_point_size)
|
| -IPC_STRUCT_TRAITS_END()
|
| -#endif
|
| -
|
| #if defined(ENABLE_PLUGINS)
|
| IPC_STRUCT_TRAITS_BEGIN(content::PepperRendererInstanceData)
|
| IPC_STRUCT_TRAITS_MEMBER(render_process_id)
|
| @@ -1173,22 +1161,6 @@ IPC_MESSAGE_ROUTED0(FrameHostMsg_HidePopup)
|
|
|
| #endif
|
|
|
| -#if defined(OS_MACOSX)
|
| -// Request that the browser load a font into shared memory for us.
|
| -IPC_SYNC_MESSAGE_CONTROL1_3(FrameHostMsg_LoadFont,
|
| - FontDescriptor /* font to load */,
|
| - uint32 /* buffer size */,
|
| - base::SharedMemoryHandle /* font data */,
|
| - uint32 /* font id */)
|
| -#elif defined(OS_WIN)
|
| -// Request that the given font characters be loaded by the browser so it's
|
| -// cached by the OS. Please see RenderMessageFilter::OnPreCacheFontCharacters
|
| -// for details.
|
| -IPC_SYNC_MESSAGE_CONTROL2_0(FrameHostMsg_PreCacheFontCharacters,
|
| - LOGFONT /* font_data */,
|
| - base::string16 /* characters */)
|
| -#endif
|
| -
|
| // Adding a new message? Stick to the sort order above: first platform
|
| // independent FrameMsg, then ifdefs for platform specific FrameMsg, then
|
| // platform independent FrameHostMsg, then ifdefs for platform specific
|
|
|