Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Multiply-included message header, no traditional include guard. | 5 // Multiply-included message header, no traditional include guard. |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) | 136 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) |
| 137 IPC_STRUCT_TRAITS_MEMBER(site) | 137 IPC_STRUCT_TRAITS_MEMBER(site) |
| 138 IPC_STRUCT_TRAITS_MEMBER(permission) | 138 IPC_STRUCT_TRAITS_MEMBER(permission) |
| 139 IPC_STRUCT_TRAITS_END() | 139 IPC_STRUCT_TRAITS_END() |
| 140 | 140 |
| 141 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData) | 141 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData) |
| 142 IPC_STRUCT_TRAITS_MEMBER(rect) | 142 IPC_STRUCT_TRAITS_MEMBER(rect) |
| 143 IPC_STRUCT_TRAITS_MEMBER(is_fullscreen) | 143 IPC_STRUCT_TRAITS_MEMBER(is_fullscreen) |
| 144 IPC_STRUCT_TRAITS_MEMBER(is_page_visible) | 144 IPC_STRUCT_TRAITS_MEMBER(is_page_visible) |
| 145 IPC_STRUCT_TRAITS_MEMBER(clip_rect) | 145 IPC_STRUCT_TRAITS_MEMBER(clip_rect) |
| 146 IPC_STRUCT_TRAITS_MEMBER(device_scale) | |
| 147 IPC_STRUCT_TRAITS_MEMBER(css_scale) | |
| 146 IPC_STRUCT_TRAITS_END() | 148 IPC_STRUCT_TRAITS_END() |
| 147 | 149 |
| 148 IPC_STRUCT_TRAITS_BEGIN(ppapi::Preferences) | 150 IPC_STRUCT_TRAITS_BEGIN(ppapi::Preferences) |
| 149 IPC_STRUCT_TRAITS_MEMBER(standard_font_family_map) | 151 IPC_STRUCT_TRAITS_MEMBER(standard_font_family_map) |
| 150 IPC_STRUCT_TRAITS_MEMBER(fixed_font_family_map) | 152 IPC_STRUCT_TRAITS_MEMBER(fixed_font_family_map) |
| 151 IPC_STRUCT_TRAITS_MEMBER(serif_font_family_map) | 153 IPC_STRUCT_TRAITS_MEMBER(serif_font_family_map) |
| 152 IPC_STRUCT_TRAITS_MEMBER(sans_serif_font_family_map) | 154 IPC_STRUCT_TRAITS_MEMBER(sans_serif_font_family_map) |
| 153 IPC_STRUCT_TRAITS_MEMBER(default_font_size) | 155 IPC_STRUCT_TRAITS_MEMBER(default_font_size) |
| 154 IPC_STRUCT_TRAITS_MEMBER(default_fixed_font_size) | 156 IPC_STRUCT_TRAITS_MEMBER(default_fixed_font_size) |
| 155 IPC_STRUCT_TRAITS_MEMBER(is_3d_supported) | 157 IPC_STRUCT_TRAITS_MEMBER(is_3d_supported) |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 838 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBGraphics2D_Scroll, | 840 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBGraphics2D_Scroll, |
| 839 ppapi::HostResource /* graphics_2d */, | 841 ppapi::HostResource /* graphics_2d */, |
| 840 bool /* clip_specified */, | 842 bool /* clip_specified */, |
| 841 PP_Rect /* clip */, | 843 PP_Rect /* clip */, |
| 842 PP_Point /* amount */) | 844 PP_Point /* amount */) |
| 843 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics2D_ReplaceContents, | 845 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics2D_ReplaceContents, |
| 844 ppapi::HostResource /* graphics_2d */, | 846 ppapi::HostResource /* graphics_2d */, |
| 845 ppapi::HostResource /* image_data */) | 847 ppapi::HostResource /* image_data */) |
| 846 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics2D_Flush, | 848 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics2D_Flush, |
| 847 ppapi::HostResource /* graphics_2d */) | 849 ppapi::HostResource /* graphics_2d */) |
| 850 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBGraphics2D_Dev_SetScale, | |
|
brettw
2012/06/19 20:21:27
Don't make this a sync message and just remove the
Josh Horwich
2012/06/19 23:56:15
Done.
| |
| 851 ppapi::HostResource /* graphics_2d */, | |
| 852 float /* scale */, | |
| 853 bool /* result */) | |
| 848 | 854 |
| 849 #if !defined(OS_NACL) | 855 #if !defined(OS_NACL) |
| 850 // PPB_Graphics3D. | 856 // PPB_Graphics3D. |
| 851 IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create, | 857 IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create, |
| 852 PP_Instance /* instance */, | 858 PP_Instance /* instance */, |
| 853 ppapi::HostResource /* share_context */, | 859 ppapi::HostResource /* share_context */, |
| 854 std::vector<int32_t> /* attrib_list */, | 860 std::vector<int32_t> /* attrib_list */, |
| 855 ppapi::HostResource /* result */) | 861 ppapi::HostResource /* result */) |
| 856 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBGraphics3D_InitCommandBuffer, | 862 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBGraphics3D_InitCommandBuffer, |
| 857 ppapi::HostResource /* context */) | 863 ppapi::HostResource /* context */) |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1378 // PPB_X509Certificate_Private | 1384 // PPB_X509Certificate_Private |
| 1379 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, | 1385 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, |
| 1380 std::vector<char> /* der */, | 1386 std::vector<char> /* der */, |
| 1381 bool /* succeeded */, | 1387 bool /* succeeded */, |
| 1382 ppapi::PPB_X509Certificate_Fields /* result */) | 1388 ppapi::PPB_X509Certificate_Fields /* result */) |
| 1383 | 1389 |
| 1384 // PPB_Font. | 1390 // PPB_Font. |
| 1385 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 1391 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, |
| 1386 std::string /* result */) | 1392 std::string /* result */) |
| 1387 #endif // !defined(OS_NACL) | 1393 #endif // !defined(OS_NACL) |
| OLD | NEW |