| 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_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ | 8 #ifndef CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ |
| 9 #define CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ | 9 #define CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ |
| 10 | 10 |
| 11 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
| 12 #include "content/common/input/input_event_ack_state.h" | 12 #include "content/common/input/input_event_ack_state.h" |
| 13 #include "content/public/common/request_context_frame_type.h" | 13 #include "content/public/common/request_context_frame_type.h" |
| 14 #include "content/public/common/request_context_type.h" | 14 #include "content/public/common/request_context_type.h" |
| 15 #include "content/public/common/resource_type.h" | 15 #include "content/public/common/resource_type.h" |
| 16 #include "ipc/ipc_message_macros.h" | 16 #include "ipc/ipc_message_macros.h" |
| 17 #include "third_party/WebKit/public/platform/WebAddressSpace.h" |
| 17 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h" | 18 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h" |
| 18 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" | 19 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" |
| 19 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h" | 20 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h" |
| 20 #include "third_party/WebKit/public/web/WebInputEvent.h" | 21 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 21 #include "third_party/WebKit/public/web/WebSharedWorkerCreationContextType.h" | 22 #include "third_party/WebKit/public/web/WebSharedWorkerCreationContextType.h" |
| 22 | 23 |
| 23 #undef IPC_MESSAGE_EXPORT | 24 #undef IPC_MESSAGE_EXPORT |
| 24 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 25 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 25 | 26 |
| 26 IPC_ENUM_TRAITS_MAX_VALUE(content::InputEventAckState, | 27 IPC_ENUM_TRAITS_MAX_VALUE(content::InputEventAckState, |
| 27 content::INPUT_EVENT_ACK_STATE_MAX) | 28 content::INPUT_EVENT_ACK_STATE_MAX) |
| 28 IPC_ENUM_TRAITS_MAX_VALUE(content::ResourceType, | 29 IPC_ENUM_TRAITS_MAX_VALUE(content::ResourceType, |
| 29 content::RESOURCE_TYPE_LAST_TYPE - 1) | 30 content::RESOURCE_TYPE_LAST_TYPE - 1) |
| 30 IPC_ENUM_TRAITS_MAX_VALUE(content::RequestContextType, | 31 IPC_ENUM_TRAITS_MAX_VALUE(content::RequestContextType, |
| 31 content::REQUEST_CONTEXT_TYPE_LAST) | 32 content::REQUEST_CONTEXT_TYPE_LAST) |
| 32 IPC_ENUM_TRAITS_MAX_VALUE(content::RequestContextFrameType, | 33 IPC_ENUM_TRAITS_MAX_VALUE(content::RequestContextFrameType, |
| 33 content::REQUEST_CONTEXT_FRAME_TYPE_LAST) | 34 content::REQUEST_CONTEXT_FRAME_TYPE_LAST) |
| 34 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContentSecurityPolicyType, | 35 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContentSecurityPolicyType, |
| 35 blink::WebContentSecurityPolicyTypeLast) | 36 blink::WebContentSecurityPolicyTypeLast) |
| 37 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebAddressSpace, blink::WebAddressSpaceLast); |
| 36 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebSharedWorkerCreationContextType, | 38 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebSharedWorkerCreationContextType, |
| 37 blink::WebSharedWorkerCreationContextTypeLast) | 39 blink::WebSharedWorkerCreationContextTypeLast) |
| 38 IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebInputEvent::Type, | 40 IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebInputEvent::Type, |
| 39 blink::WebInputEvent::TypeFirst, | 41 blink::WebInputEvent::TypeFirst, |
| 40 blink::WebInputEvent::TypeLast) | 42 blink::WebInputEvent::TypeLast) |
| 41 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebPageVisibilityState, | 43 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebPageVisibilityState, |
| 42 blink::WebPageVisibilityStateLast) | 44 blink::WebPageVisibilityStateLast) |
| 43 | 45 |
| 44 IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline) | 46 IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline) |
| 45 IPC_STRUCT_TRAITS_MEMBER(startOffset) | 47 IPC_STRUCT_TRAITS_MEMBER(startOffset) |
| 46 IPC_STRUCT_TRAITS_MEMBER(endOffset) | 48 IPC_STRUCT_TRAITS_MEMBER(endOffset) |
| 47 IPC_STRUCT_TRAITS_MEMBER(color) | 49 IPC_STRUCT_TRAITS_MEMBER(color) |
| 48 IPC_STRUCT_TRAITS_MEMBER(thick) | 50 IPC_STRUCT_TRAITS_MEMBER(thick) |
| 49 IPC_STRUCT_TRAITS_MEMBER(backgroundColor) | 51 IPC_STRUCT_TRAITS_MEMBER(backgroundColor) |
| 50 IPC_STRUCT_TRAITS_END() | 52 IPC_STRUCT_TRAITS_END() |
| 51 | 53 |
| 52 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ | 54 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |