content/common/content_param_traits_macros.h - Issue 115713004: Move the worker script loading code to the worker process (phase:2/5)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 115713004: Move the worker script loading code to the worker process (phase:2/5) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move IPC_ENUM_TRAITS(blink::WebContentSecurityPolicyType) to content_param_traits_macros.h. 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

« no previous file with comments | « content/browser/worker_host/worker_service_impl.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

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/WebInputEvent.h"	14 #include "third_party/WebKit/public/web/WebInputEvent.h"

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

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

16	17

17 #undef IPC_MESSAGE_EXPORT	18 #undef IPC_MESSAGE_EXPORT

18 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	19 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

19	20

20 IPC_ENUM_TRAITS(ResourceType::Type)	21 IPC_ENUM_TRAITS(ResourceType::Type)

	22 IPC_ENUM_TRAITS(blink::WebContentSecurityPolicyType)

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

22 IPC_ENUM_TRAITS(ui::LatencyComponentType)	24 IPC_ENUM_TRAITS(ui::LatencyComponentType)

23	25

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

25 IPC_STRUCT_TRAITS_MEMBER(sequence_number)	27 IPC_STRUCT_TRAITS_MEMBER(sequence_number)

26 IPC_STRUCT_TRAITS_MEMBER(event_time)	28 IPC_STRUCT_TRAITS_MEMBER(event_time)

27 IPC_STRUCT_TRAITS_MEMBER(event_count)	29 IPC_STRUCT_TRAITS_MEMBER(event_count)

28 IPC_STRUCT_TRAITS_END()	30 IPC_STRUCT_TRAITS_END()

29	31

30 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo)	32 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo)

31 IPC_STRUCT_TRAITS_MEMBER(latency_components)	33 IPC_STRUCT_TRAITS_MEMBER(latency_components)

32 IPC_STRUCT_TRAITS_MEMBER(trace_id)	34 IPC_STRUCT_TRAITS_MEMBER(trace_id)

33 IPC_STRUCT_TRAITS_MEMBER(terminated)	35 IPC_STRUCT_TRAITS_MEMBER(terminated)

34 IPC_STRUCT_TRAITS_END()	36 IPC_STRUCT_TRAITS_END()

35	37

36 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_	38 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_

OLD	NEW