Skip to content

Commit fa32bdf

Browse files
committed
servo: Merge #6593 - compositing: Make the constellation messages serializable (from pcwalton:constellation-ipc); r=jdm
Same idea as before. This depends on: * servo/euclid#94 * hyperium/hyper#603 r? jdm Source-Repo: https://github.com/servo/servo Source-Revision: 2f4bdc6ad631dc56b64622e3390943b59270b3ae UltraBlame original commit: 2564d34df7d27ad820f50ea42fdbb4667faab300
1 parent 220fc73 commit fa32bdf

File tree

31 files changed

+1251
-274
lines changed

31 files changed

+1251
-274
lines changed

servo/components/compositing/Cargo.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,15 @@ rust
249249
-
250250
png
251251
"
252+
features
253+
=
254+
[
255+
"
256+
serde
257+
-
258+
serialization
259+
"
260+
]
252261
[
253262
dependencies
254263
.
@@ -319,7 +328,7 @@ url
319328
.
320329
2
321330
.
322-
35
331+
36
323332
"
324333
time
325334
=

servo/components/compositing/compositor_task.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ ipc_channel
116116
ipc
117117
:
118118
:
119+
{
119120
IpcReceiver
121+
IpcSender
122+
}
120123
;
121124
use
122125
layers
@@ -1596,7 +1599,7 @@ channel
15961599
.
15971600
CreatePng
15981601
(
1599-
Sender
1602+
IpcSender
16001603
<
16011604
Option
16021605
<

servo/components/compositing/constellation.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@ ipc_channel
201201
:
202202
:
203203
ipc
204+
:
205+
:
206+
{
207+
self
208+
IpcSender
209+
}
204210
;
205211
use
206212
layout_traits
@@ -447,7 +453,6 @@ mpsc
447453
:
448454
:
449455
{
450-
Sender
451456
Receiver
452457
channel
453458
}
@@ -1440,7 +1445,7 @@ Option
14401445
<
14411446
(
14421447
PipelineId
1443-
Sender
1448+
IpcSender
14441449
<
14451450
webdriver_msg
14461451
:
@@ -6164,7 +6169,7 @@ FrameId
61646169
>
61656170
resp_chan
61666171
:
6167-
Sender
6172+
IpcSender
61686173
<
61696174
Option
61706175
<
@@ -6283,7 +6288,7 @@ subpage_id
62836288
SubpageId
62846289
resp_chan
62856290
:
6286-
Sender
6291+
IpcSender
62876292
<
62886293
Option
62896294
<

servo/components/devtools/Cargo.toml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,27 @@ rs
4343
[
4444
dependencies
4545
.
46+
hyper
47+
]
48+
version
49+
=
50+
"
51+
0
52+
.
53+
6
54+
"
55+
features
56+
=
57+
[
58+
"
59+
serde
60+
-
61+
serialization
62+
"
63+
]
64+
[
65+
dependencies
66+
.
4667
devtools_traits
4768
]
4869
path
@@ -104,12 +125,7 @@ serialize
104125
url
105126
=
106127
"
107-
*
108-
"
109-
hyper
110-
=
111-
"
112128
0
113129
.
114-
6
130+
2
115131
"

servo/components/devtools_traits/Cargo.toml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,27 @@ rs
4343
[
4444
dependencies
4545
.
46+
hyper
47+
]
48+
version
49+
=
50+
"
51+
0
52+
.
53+
6
54+
"
55+
features
56+
=
57+
[
58+
"
59+
serde
60+
-
61+
serialization
62+
"
63+
]
64+
[
65+
dependencies
66+
.
4667
msg
4768
]
4869
path
@@ -86,14 +107,9 @@ serialize
86107
url
87108
=
88109
"
89-
*
90-
"
91-
hyper
92-
=
93-
"
94110
0
95111
.
96-
6
112+
2
97113
"
98114
bitflags
99115
=

servo/components/gfx/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ url
243243
.
244244
2
245245
.
246-
35
246+
36
247247
"
248248
time
249249
=

servo/components/layout/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ url
326326
.
327327
2
328328
.
329-
35
329+
36
330330
"
331331
bitflags
332332
=

servo/components/layout_traits/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ url
152152
.
153153
2
154154
.
155-
35
155+
36
156156
"
157157
euclid
158158
=

servo/components/msg/Cargo.toml

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,57 @@ rust
132132
-
133133
png
134134
"
135+
features
136+
=
137+
[
138+
"
139+
serde
140+
-
141+
serialization
142+
"
143+
]
144+
[
145+
dependencies
146+
.
147+
hyper
148+
]
149+
version
150+
=
151+
"
152+
0
153+
.
154+
6
155+
"
156+
features
157+
=
158+
[
159+
"
160+
serde
161+
-
162+
serialization
163+
"
164+
]
165+
[
166+
dependencies
167+
.
168+
url
169+
]
170+
version
171+
=
172+
"
173+
0
174+
.
175+
2
176+
.
177+
36
178+
"
179+
features
180+
=
181+
[
182+
"
183+
serde_serialization
184+
"
185+
]
135186
[
136187
dependencies
137188
.
@@ -159,27 +210,11 @@ channel
159210
[
160211
dependencies
161212
]
162-
url
163-
=
164-
"
165-
0
166-
.
167-
2
168-
.
169-
35
170-
"
171213
bitflags
172214
=
173215
"
174216
*
175217
"
176-
hyper
177-
=
178-
"
179-
0
180-
.
181-
6
182-
"
183218
rustc
184219
-
185220
serialize

0 commit comments

Comments
 (0)