2
2
* License, v. 2.0. If a copy of the MPL was not distributed with this
3
3
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4
4
5
- use api:: { BorderDetails , BorderDisplayItem , BorderRadius , BoxShadowClipMode , ClipAndScrollInfo } ;
6
- use api:: { ClipId , ColorF , DeviceIntPoint , DeviceIntRect , DeviceIntSize , DeviceUintRect } ;
7
- use api:: { DeviceUintSize , ExtendMode , FIND_ALL , FilterOp , FontInstance , FontRenderMode } ;
5
+ use api:: { BorderDetails , BorderDisplayItem , BorderRadius , BoxShadowClipMode , BuiltDisplayList } ;
6
+ use api:: { ClipAndScrollInfo , ClipId , ColorF } ;
7
+ use api:: { DeviceIntPoint , DeviceIntRect , DeviceIntSize , DeviceUintRect , DeviceUintSize } ;
8
+ use api:: { ExtendMode , FIND_ALL , FilterOp , FontInstance , FontRenderMode } ;
8
9
use api:: { GlyphInstance , GlyphOptions , GradientStop , HitTestFlags , HitTestItem , HitTestResult } ;
9
10
use api:: { ImageKey , ImageRendering , ItemRange , ItemTag , LayerPoint , LayerPrimitiveInfo , LayerRect } ;
10
11
use api:: { LayerSize , LayerToScrollTransform , LayerVector2D , LayoutVector2D , LineOrientation } ;
@@ -24,7 +25,7 @@ use plane_split::{BspSplitter, Polygon, Splitter};
24
25
use prim_store:: { BoxShadowPrimitiveCpu , TexelRect , YuvImagePrimitiveCpu } ;
25
26
use prim_store:: { GradientPrimitiveCpu , ImagePrimitiveCpu , LinePrimitive , PrimitiveKind } ;
26
27
use prim_store:: { PrimitiveContainer , PrimitiveIndex } ;
27
- use prim_store:: { PrimitiveStore , RadialGradientPrimitiveCpu , TextRunMode } ;
28
+ use prim_store:: { PrimitiveStore , RadialGradientPrimitiveCpu } ;
28
29
use prim_store:: { RectanglePrimitive , TextRunPrimitiveCpu , TextShadowPrimitiveCpu } ;
29
30
use profiler:: { FrameProfileCounters , GpuCacheProfileCounters , TextureCacheProfileCounters } ;
30
31
use render_task:: { AlphaRenderItem , ClipWorkItem , RenderTask } ;
@@ -128,6 +129,8 @@ pub struct PrimitiveContext<'a> {
128
129
pub current_clip_stack : Vec < ClipWorkItem > ,
129
130
pub clip_bounds : DeviceIntRect ,
130
131
pub clip_id : ClipId ,
132
+
133
+ pub display_list : & ' a BuiltDisplayList ,
131
134
}
132
135
133
136
impl < ' a > PrimitiveContext < ' a > {
@@ -139,6 +142,7 @@ impl<'a> PrimitiveContext<'a> {
139
142
clip_scroll_tree : & ClipScrollTree ,
140
143
clip_store : & ClipStore ,
141
144
device_pixel_ratio : f32 ,
145
+ display_list : & ' a BuiltDisplayList ,
142
146
) -> Option < Self > {
143
147
144
148
let mut current_clip_stack = Vec :: new ( ) ;
@@ -194,6 +198,7 @@ impl<'a> PrimitiveContext<'a> {
194
198
clip_bounds,
195
199
device_pixel_ratio,
196
200
clip_id,
201
+ display_list,
197
202
} )
198
203
}
199
204
}
@@ -1714,6 +1719,7 @@ impl FrameBuilder {
1714
1719
clip_scroll_tree,
1715
1720
& self . clip_store ,
1716
1721
device_pixel_ratio,
1722
+ display_list,
1717
1723
) ;
1718
1724
1719
1725
let prim_context = match prim_context {
@@ -1739,8 +1745,6 @@ impl FrameBuilder {
1739
1745
& prim_context,
1740
1746
resource_cache,
1741
1747
gpu_cache,
1742
- display_list,
1743
- TextRunMode :: Normal ,
1744
1748
render_tasks,
1745
1749
& mut self . clip_store ,
1746
1750
) {
0 commit comments