content/common/content_param_traits_macros.h - Issue 141163002: Make PrerenderTracker's resource_throttle_io_thread_map_ use RenderFrame IDs instead of RenderView …

Side by Side Diff: content/common/content_param_traits_macros.h

Issue 141163002: Make PrerenderTracker's resource_throttle_io_thread_map_ use RenderFrame IDs instead of RenderView … (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: simplify code Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/prerender/prerender_resource_throttle.cc ('K') | « content/common/DEPS ('k') | content/common/resource_messages.h » ('j') | content/common/resource_messages.h » ('J')

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 "ipc/ipc_message_macros.h"	12 #include "ipc/ipc_message_macros.h"

13 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"	13 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"

14 #include "third_party/WebKit/public/web/WebInputEvent.h"	14 #include "third_party/WebKit/public/web/WebInputEvent.h"

	15 #include "third_party/WebKit/public/web/WebPageVisibilityState.h"

15 #include "ui/events/latency_info.h"	16 #include "ui/events/latency_info.h"

16 #include "webkit/common/resource_type.h"	17 #include "webkit/common/resource_type.h"

17	18

18 #undef IPC_MESSAGE_EXPORT	19 #undef IPC_MESSAGE_EXPORT

19 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	20 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

20	21

21 IPC_ENUM_TRAITS(ResourceType::Type)	22 IPC_ENUM_TRAITS(ResourceType::Type)

22 IPC_ENUM_TRAITS(blink::WebContentSecurityPolicyType)	23 IPC_ENUM_TRAITS(blink::WebContentSecurityPolicyType)

23 IPC_ENUM_TRAITS(blink::WebInputEvent::Type)	24 IPC_ENUM_TRAITS(blink::WebInputEvent::Type)

	25 IPC_ENUM_TRAITS(blink::WebPageVisibilityState)

24 IPC_ENUM_TRAITS(ui::LatencyComponentType)	26 IPC_ENUM_TRAITS(ui::LatencyComponentType)

25	27

26 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo::LatencyComponent)	28 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo::LatencyComponent)

27 IPC_STRUCT_TRAITS_MEMBER(sequence_number)	29 IPC_STRUCT_TRAITS_MEMBER(sequence_number)

28 IPC_STRUCT_TRAITS_MEMBER(event_time)	30 IPC_STRUCT_TRAITS_MEMBER(event_time)

29 IPC_STRUCT_TRAITS_MEMBER(event_count)	31 IPC_STRUCT_TRAITS_MEMBER(event_count)

30 IPC_STRUCT_TRAITS_END()	32 IPC_STRUCT_TRAITS_END()

31	33

32 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo)	34 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo)

33 IPC_STRUCT_TRAITS_MEMBER(latency_components)	35 IPC_STRUCT_TRAITS_MEMBER(latency_components)

34 IPC_STRUCT_TRAITS_MEMBER(trace_id)	36 IPC_STRUCT_TRAITS_MEMBER(trace_id)

35 IPC_STRUCT_TRAITS_MEMBER(terminated)	37 IPC_STRUCT_TRAITS_MEMBER(terminated)

36 IPC_STRUCT_TRAITS_END()	38 IPC_STRUCT_TRAITS_END()

37	39

38 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_	40 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_

OLD	NEW