Skip to content

Commit

Permalink
Bug 1511661 - Update webrender to commit 1619d945e853db14a9d62ed75dce…
Browse files Browse the repository at this point in the history
…7216ff3cdbc2 (WR PR #3366). r=kats

servo/webrender#3366

Differential Revision: https://phabricator.services.mozilla.com/D13627

UltraBlame original commit: df8c8aa616045a2076d1f0c8b1ebedf322aec212
  • Loading branch information
marco-c committed Oct 3, 2019
1 parent 34c56c8 commit b37d521
Show file tree
Hide file tree
Showing 3 changed files with 384 additions and 107 deletions.
2 changes: 1 addition & 1 deletion gfx/webrender_bindings/revision.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dbaa10971f08f964120ba339f5b0ab3e7ace77d6
1619d945e853db14a9d62ed75dce7216ff3cdbc2
234 changes: 132 additions & 102 deletions gfx/wr/webrender/src/intern.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,17 @@ use
std
:
:
{
mem
;
use
std
:
:
ops
u64
}
;
use
std
util
:
:
u64
VecHelper
;
/
*
Expand Down Expand Up @@ -448,10 +446,22 @@ updates
Vec
<
Update
>
/
/
/
Actual
new
data
to
insert
.
data
:
Vec
<
S
>
>
}
#
[
Expand Down Expand Up @@ -642,14 +652,8 @@ Deserialize
pub
enum
UpdateKind
<
S
>
{
Insert
(
S
)
Remove
UpdateEpoch
}
Expand Down Expand Up @@ -686,19 +690,13 @@ Deserialize
pub
struct
Update
<
S
>
{
index
:
usize
kind
:
UpdateKind
<
S
>
}
/
/
Expand Down Expand Up @@ -947,6 +945,18 @@ S
>
)
{
let
mut
data_iter
=
update_list
.
data
.
into_iter
(
)
;
for
update
in
Expand All @@ -963,15 +973,22 @@ UpdateKind
:
:
Insert
(
data
)
=
>
{
let
item
=
self
.
items
.
entry
(
update
.
index
)
.
set
(
Item
{
data
Expand All @@ -981,53 +998,25 @@ T
:
from
(
data
data_iter
.
next
(
)
.
unwrap
(
)
)
epoch
:
update_list
.
epoch
}
;
if
self
.
items
.
len
(
)
=
=
update
.
index
{
self
.
items
.
push
(
item
)
}
else
{
self
.
items
[
update
.
index
]
=
item
;
}
}
UpdateKind
:
:
Expand Down Expand Up @@ -1077,6 +1066,20 @@ epoch
}
}
}
debug_assert
!
(
data_iter
.
next
(
)
.
is_none
(
)
)
;
}
}
/
Expand Down Expand Up @@ -1439,10 +1442,22 @@ updates
Vec
<
Update
>
/
/
/
Pending
new
data
to
insert
.
update_data
:
Vec
<
S
>
>
/
/
/
Expand Down Expand Up @@ -1570,6 +1585,14 @@ Vec
new
(
)
update_data
:
Vec
:
:
new
(
)
current_epoch
:
Epoch
Expand Down Expand Up @@ -1956,15 +1979,25 @@ UpdateKind
:
:
Insert
}
)
;
self
.
update_data
.
alloc
(
)
.
init
(
data
.
clone
(
)
)
}
)
;
/
/
Expand Down Expand Up @@ -2068,9 +2101,17 @@ is
being
interned
.
let
local_item
=
self
.
local_data
.
entry
(
index
)
.
set
(
Item
{
epoch
Expand All @@ -2084,41 +2125,8 @@ f
(
)
}
;
if
self
.
local_data
.
len
(
)
=
=
index
{
self
.
local_data
.
push
(
local_item
)
;
}
else
{
self
.
local_data
[
index
]
=
local_item
;
}
handle
}
/
Expand Down Expand Up @@ -2197,6 +2205,27 @@ new
)
;
let
data
=
mem
:
:
replace
(
&
mut
self
.
update_data
Vec
:
:
new
(
)
)
;
let
free_list
=
&
Expand Down Expand Up @@ -2421,6 +2450,7 @@ updates
UpdateList
{
updates
data
epoch
:
self
Expand Down
Loading

0 comments on commit b37d521

Please sign in to comment.