Bug 1509497 - Update webrender to commit b4f7e431d56d35051085b4f9486f1cee3dd7339b (WR PR #3341). r=kats

marco-c · marco-c · commit 5cf48c5597b1 · 2019-10-03T17:53:15.000Z
servo/webrender#3341 Differential Revision: https://phabricator.services.mozilla.com/D12753 UltraBlame original commit: ab0838a6a61bbcba9b45a622ee16b4ea744ec712
diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt
@@ -1 +1 @@
-9a903a2c6912d2651faddadf81e76bf743657d72
+b4f7e431d56d35051085b4f9486f1cee3dd7339b
diff --git a/gfx/wr/webrender_api/src/display_list.rs b/gfx/wr/webrender_api/src/display_list.rs
@@ -7319,6 +7319,10 @@ self
 item
 :
 SpecificDisplayItem
+clip_and_scroll
+:
+&
+ClipAndScrollInfo
 )
 {
 let
@@ -7351,17 +7355,7 @@ item
 clip_and_scroll
 :
 *
-self
-.
-clip_stack
-.
-last
-(
-)
-.
-unwrap
-(
-)
+clip_and_scroll
 info
 }
 )
@@ -8624,6 +8618,22 @@ mut
 self
 )
 {
+let
+clip_and_scroll
+=
+*
+self
+.
+clip_stack
+.
+last
+(
+)
+.
+unwrap
+(
+)
+;
 self
 .
 push_new_empty_item
@@ -8632,6 +8642,8 @@ SpecificDisplayItem
 :
 :
 PopReferenceFrame
+&
+clip_and_scroll
 )
 ;
 }
@@ -8716,6 +8728,22 @@ mut
 self
 )
 {
+let
+clip_and_scroll
+=
+*
+self
+.
+clip_stack
+.
+last
+(
+)
+.
+unwrap
+(
+)
+;
 self
 .
 push_new_empty_item
@@ -8724,6 +8752,8 @@ SpecificDisplayItem
 :
 :
 PopStackingContext
+&
+clip_and_scroll
 )
 ;
 }
@@ -8752,6 +8782,22 @@ is_empty
 return
 ;
 }
+let
+clip_and_scroll
+=
+*
+self
+.
+clip_stack
+.
+last
+(
+)
+.
+unwrap
+(
+)
+;
 self
 .
 push_new_empty_item
@@ -8760,6 +8806,8 @@ SpecificDisplayItem
 :
 :
 SetGradientStops
+&
+clip_and_scroll
 )
 ;
 self
@@ -9129,6 +9177,22 @@ generate_clip_chain_id
 (
 )
 ;
+let
+clip_and_scroll
+=
+*
+self
+.
+clip_stack
+.
+last
+(
+)
+.
+unwrap
+(
+)
+;
 self
 .
 push_new_empty_item
@@ -9144,6 +9208,8 @@ id
 parent
 }
 )
+&
+clip_and_scroll
 )
 ;
 self
@@ -9690,6 +9756,22 @@ mut
 self
 )
 {
+let
+clip_and_scroll
+=
+*
+self
+.
+clip_stack
+.
+last
+(
+)
+.
+unwrap
+(
+)
+;
 self
 .
 push_new_empty_item
@@ -9698,6 +9780,8 @@ SpecificDisplayItem
 :
 :
 PopAllShadows
+&
+clip_and_scroll
 )
 ;
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-9a903a2c6912d2651faddadf81e76bf743657d72`
	`1`	`+b4f7e431d56d35051085b4f9486f1cee3dd7339b`
Original file line number	Diff line number	Diff line change
`@@ -7319,6 +7319,10 @@ self`
`7319`	`7319`	`item`
`7320`	`7320`	`:`
`7321`	`7321`	`SpecificDisplayItem`
	`7322`	`+clip_and_scroll`
	`7323`	`+:`
	`7324`	`+&`
	`7325`	`+ClipAndScrollInfo`
`7322`	`7326`	`)`
`7323`	`7327`	`{`
`7324`	`7328`	`let`
`@@ -7351,17 +7355,7 @@ item`
`7351`	`7355`	`clip_and_scroll`
`7352`	`7356`	`:`
`7353`	`7357`	`*`
`7354`		`-self`
`7355`		`-.`
`7356`		`-clip_stack`
`7357`		`-.`
`7358`		`-last`
`7359`		`-(`
`7360`		`-)`
`7361`		`-.`
`7362`		`-unwrap`
`7363`		`-(`
`7364`		`-)`
	`7358`	`+clip_and_scroll`
`7365`	`7359`	`info`
`7366`	`7360`	`}`
`7367`	`7361`	`)`
`@@ -8624,6 +8618,22 @@ mut`
`8624`	`8618`	`self`
`8625`	`8619`	`)`
`8626`	`8620`	`{`
	`8621`	`+let`
	`8622`	`+clip_and_scroll`
	`8623`	`+=`
	`8624`	`+*`
	`8625`	`+self`
	`8626`	`+.`
	`8627`	`+clip_stack`
	`8628`	`+.`
	`8629`	`+last`
	`8630`	`+(`
	`8631`	`+)`
	`8632`	`+.`
	`8633`	`+unwrap`
	`8634`	`+(`
	`8635`	`+)`
	`8636`	`+;`
`8627`	`8637`	`self`
`8628`	`8638`	`.`
`8629`	`8639`	`push_new_empty_item`
`@@ -8632,6 +8642,8 @@ SpecificDisplayItem`
`8632`	`8642`	`:`
`8633`	`8643`	`:`
`8634`	`8644`	`PopReferenceFrame`
	`8645`	`+&`
	`8646`	`+clip_and_scroll`
`8635`	`8647`	`)`
`8636`	`8648`	`;`
`8637`	`8649`	`}`
`@@ -8716,6 +8728,22 @@ mut`
`8716`	`8728`	`self`
`8717`	`8729`	`)`
`8718`	`8730`	`{`
	`8731`	`+let`
	`8732`	`+clip_and_scroll`
	`8733`	`+=`
	`8734`	`+*`
	`8735`	`+self`
	`8736`	`+.`
	`8737`	`+clip_stack`
	`8738`	`+.`
	`8739`	`+last`
	`8740`	`+(`
	`8741`	`+)`
	`8742`	`+.`
	`8743`	`+unwrap`
	`8744`	`+(`
	`8745`	`+)`
	`8746`	`+;`
`8719`	`8747`	`self`
`8720`	`8748`	`.`
`8721`	`8749`	`push_new_empty_item`
`@@ -8724,6 +8752,8 @@ SpecificDisplayItem`
`8724`	`8752`	`:`
`8725`	`8753`	`:`
`8726`	`8754`	`PopStackingContext`
	`8755`	`+&`
	`8756`	`+clip_and_scroll`
`8727`	`8757`	`)`
`8728`	`8758`	`;`
`8729`	`8759`	`}`
`@@ -8752,6 +8782,22 @@ is_empty`
`8752`	`8782`	`return`
`8753`	`8783`	`;`
`8754`	`8784`	`}`
	`8785`	`+let`
	`8786`	`+clip_and_scroll`
	`8787`	`+=`
	`8788`	`+*`
	`8789`	`+self`
	`8790`	`+.`
	`8791`	`+clip_stack`
	`8792`	`+.`
	`8793`	`+last`
	`8794`	`+(`
	`8795`	`+)`
	`8796`	`+.`
	`8797`	`+unwrap`
	`8798`	`+(`
	`8799`	`+)`
	`8800`	`+;`
`8755`	`8801`	`self`
`8756`	`8802`	`.`
`8757`	`8803`	`push_new_empty_item`
`@@ -8760,6 +8806,8 @@ SpecificDisplayItem`
`8760`	`8806`	`:`
`8761`	`8807`	`:`
`8762`	`8808`	`SetGradientStops`
	`8809`	`+&`
	`8810`	`+clip_and_scroll`
`8763`	`8811`	`)`
`8764`	`8812`	`;`
`8765`	`8813`	`self`
`@@ -9129,6 +9177,22 @@ generate_clip_chain_id`
`9129`	`9177`	`(`
`9130`	`9178`	`)`
`9131`	`9179`	`;`
	`9180`	`+let`
	`9181`	`+clip_and_scroll`
	`9182`	`+=`
	`9183`	`+*`
	`9184`	`+self`
	`9185`	`+.`
	`9186`	`+clip_stack`
	`9187`	`+.`
	`9188`	`+last`
	`9189`	`+(`
	`9190`	`+)`
	`9191`	`+.`
	`9192`	`+unwrap`
	`9193`	`+(`
	`9194`	`+)`
	`9195`	`+;`
`9132`	`9196`	`self`
`9133`	`9197`	`.`
`9134`	`9198`	`push_new_empty_item`
`@@ -9144,6 +9208,8 @@ id`
`9144`	`9208`	`parent`
`9145`	`9209`	`}`
`9146`	`9210`	`)`
	`9211`	`+&`
	`9212`	`+clip_and_scroll`
`9147`	`9213`	`)`
`9148`	`9214`	`;`
`9149`	`9215`	`self`
`@@ -9690,6 +9756,22 @@ mut`
`9690`	`9756`	`self`
`9691`	`9757`	`)`
`9692`	`9758`	`{`
	`9759`	`+let`
	`9760`	`+clip_and_scroll`
	`9761`	`+=`
	`9762`	`+*`
	`9763`	`+self`
	`9764`	`+.`
	`9765`	`+clip_stack`
	`9766`	`+.`
	`9767`	`+last`
	`9768`	`+(`
	`9769`	`+)`
	`9770`	`+.`
	`9771`	`+unwrap`
	`9772`	`+(`
	`9773`	`+)`
	`9774`	`+;`
`9693`	`9775`	`self`
`9694`	`9776`	`.`
`9695`	`9777`	`push_new_empty_item`
`@@ -9698,6 +9780,8 @@ SpecificDisplayItem`
`9698`	`9780`	`:`
`9699`	`9781`	`:`
`9700`	`9782`	`PopAllShadows`
	`9783`	`+&`
	`9784`	`+clip_and_scroll`
`9701`	`9785`	`)`
`9702`	`9786`	`;`
`9703`	`9787`	`}`