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 // Singly or Multiply-included shared traits file depending on circumstances. | 5 // Singly or Multiply-included shared traits file depending on circumstances. |
6 // This allows the use of IPC serialization macros in more than one IPC message | 6 // This allows the use of IPC serialization macros in more than one IPC message |
7 // file. | 7 // file. |
8 #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 8 #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
9 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 9 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
10 | 10 |
11 #include "content/public/common/console_message_level.h" | 11 #include "content/public/common/console_message_level.h" |
12 #include "content/public/common/referrer.h" | 12 #include "content/public/common/referrer.h" |
13 #include "content/public/common/security_style.h" | 13 #include "content/public/common/security_style.h" |
14 #include "content/public/common/ssl_status.h" | 14 #include "content/public/common/ssl_status.h" |
15 #include "content/public/common/web_preferences.h" | 15 #include "content/public/common/web_preferences.h" |
16 #include "content/public/common/webplugininfo.h" | 16 #include "content/public/common/webplugininfo.h" |
17 #include "ipc/ipc_message_macros.h" | 17 #include "ipc/ipc_message_macros.h" |
18 #include "net/base/network_change_notifier.h" | 18 #include "net/base/network_change_notifier.h" |
19 #include "net/base/request_priority.h" | 19 #include "net/base/request_priority.h" |
| 20 #include "third_party/WebKit/public/platform/WebFloatPoint.h" |
20 #include "third_party/WebKit/public/platform/WebPoint.h" | 21 #include "third_party/WebKit/public/platform/WebPoint.h" |
21 #include "third_party/WebKit/public/platform/WebRect.h" | 22 #include "third_party/WebKit/public/platform/WebRect.h" |
22 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" | 23 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" |
23 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 24 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
24 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 25 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
25 #include "ui/base/page_transition_types.h" | 26 #include "ui/base/page_transition_types.h" |
26 #include "ui/base/window_open_disposition.h" | 27 #include "ui/base/window_open_disposition.h" |
27 | 28 |
28 #undef IPC_MESSAGE_EXPORT | 29 #undef IPC_MESSAGE_EXPORT |
29 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 30 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
(...skipping 20 matching lines...) Expand all Loading... |
50 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::PointerType, | 51 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::PointerType, |
51 ui::POINTER_TYPE_FIRST, | 52 ui::POINTER_TYPE_FIRST, |
52 ui::POINTER_TYPE_LAST) | 53 ui::POINTER_TYPE_LAST) |
53 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::HoverType, | 54 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::HoverType, |
54 ui::HOVER_TYPE_FIRST, | 55 ui::HOVER_TYPE_FIRST, |
55 ui::HOVER_TYPE_LAST) | 56 ui::HOVER_TYPE_LAST) |
56 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ImageAnimationPolicy, | 57 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ImageAnimationPolicy, |
57 content::IMAGE_ANIMATION_POLICY_ALLOWED, | 58 content::IMAGE_ANIMATION_POLICY_ALLOWED, |
58 content::IMAGE_ANIMATION_POLICY_NO_ANIMATION) | 59 content::IMAGE_ANIMATION_POLICY_NO_ANIMATION) |
59 | 60 |
| 61 IPC_STRUCT_TRAITS_BEGIN(blink::WebFloatPoint) |
| 62 IPC_STRUCT_TRAITS_MEMBER(x) |
| 63 IPC_STRUCT_TRAITS_MEMBER(y) |
| 64 IPC_STRUCT_TRAITS_END() |
| 65 |
60 IPC_STRUCT_TRAITS_BEGIN(blink::WebPoint) | 66 IPC_STRUCT_TRAITS_BEGIN(blink::WebPoint) |
61 IPC_STRUCT_TRAITS_MEMBER(x) | 67 IPC_STRUCT_TRAITS_MEMBER(x) |
62 IPC_STRUCT_TRAITS_MEMBER(y) | 68 IPC_STRUCT_TRAITS_MEMBER(y) |
63 IPC_STRUCT_TRAITS_END() | 69 IPC_STRUCT_TRAITS_END() |
64 | 70 |
65 IPC_STRUCT_TRAITS_BEGIN(blink::WebRect) | 71 IPC_STRUCT_TRAITS_BEGIN(blink::WebRect) |
66 IPC_STRUCT_TRAITS_MEMBER(x) | 72 IPC_STRUCT_TRAITS_MEMBER(x) |
67 IPC_STRUCT_TRAITS_MEMBER(y) | 73 IPC_STRUCT_TRAITS_MEMBER(y) |
68 IPC_STRUCT_TRAITS_MEMBER(width) | 74 IPC_STRUCT_TRAITS_MEMBER(width) |
69 IPC_STRUCT_TRAITS_MEMBER(height) | 75 IPC_STRUCT_TRAITS_MEMBER(height) |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 IPC_STRUCT_TRAITS_MEMBER(statusBarVisible) | 246 IPC_STRUCT_TRAITS_MEMBER(statusBarVisible) |
241 IPC_STRUCT_TRAITS_MEMBER(toolBarVisible) | 247 IPC_STRUCT_TRAITS_MEMBER(toolBarVisible) |
242 IPC_STRUCT_TRAITS_MEMBER(locationBarVisible) | 248 IPC_STRUCT_TRAITS_MEMBER(locationBarVisible) |
243 IPC_STRUCT_TRAITS_MEMBER(scrollbarsVisible) | 249 IPC_STRUCT_TRAITS_MEMBER(scrollbarsVisible) |
244 IPC_STRUCT_TRAITS_MEMBER(resizable) | 250 IPC_STRUCT_TRAITS_MEMBER(resizable) |
245 IPC_STRUCT_TRAITS_MEMBER(fullscreen) | 251 IPC_STRUCT_TRAITS_MEMBER(fullscreen) |
246 IPC_STRUCT_TRAITS_MEMBER(dialog) | 252 IPC_STRUCT_TRAITS_MEMBER(dialog) |
247 IPC_STRUCT_TRAITS_END() | 253 IPC_STRUCT_TRAITS_END() |
248 | 254 |
249 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 255 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
OLD | NEW |