@@ -1314,12 +1314,10 @@ pub(crate) fn wr_translate_external_scroll_id(scroll_id: ExternalScrollId) -> Wr
1314
1314
}
1315
1315
1316
1316
pub ( crate ) fn wr_translate_display_list ( input : CachedDisplayList , pipeline_id : PipelineId ) -> WrBuiltDisplayList {
1317
- println ! ( "{:#?}" , input) ;
1318
1317
let root_space_and_clip = WrSpaceAndClipInfo :: root_scroll ( wr_translate_pipeline_id ( pipeline_id) ) ;
1319
1318
let mut positioned_items = Vec :: new ( ) ;
1320
1319
let mut builder = WrDisplayListBuilder :: new ( wr_translate_pipeline_id ( pipeline_id) ) ;
1321
1320
push_display_list_msg ( & mut builder, input. root , root_space_and_clip. spatial_id , root_space_and_clip. clip_id , & mut positioned_items) ;
1322
- builder. dump_serialized_display_list ( ) ;
1323
1321
let ( _pipeline_id, built_display_list) = builder. finalize ( ) ;
1324
1322
built_display_list
1325
1323
}
@@ -1407,7 +1405,7 @@ fn push_frame(
1407
1405
parent_clip_id : WrClipId ,
1408
1406
positioned_items : & mut Vec < ( WrSpatialId , WrClipId ) >
1409
1407
) {
1410
- let clip_rect = get_frame_clip_rect ( frame. position , frame. size ) ;
1408
+ let clip_rect = LogicalRect :: new ( LogicalPosition :: zero ( ) , frame . size ) ; // get_frame_clip_rect(frame.position, frame.size);
1411
1409
1412
1410
for item in frame. content {
1413
1411
push_display_list_content (
@@ -1432,17 +1430,6 @@ fn push_frame(
1432
1430
}
1433
1431
}
1434
1432
1435
- fn get_frame_clip_rect ( position_info : PositionInfo , rect_size : LogicalSize ) -> LogicalRect {
1436
- match position_info {
1437
- PositionInfo :: Static { x_offset, y_offset, .. } |
1438
- PositionInfo :: Relative { x_offset, y_offset, .. } |
1439
- PositionInfo :: Absolute { x_offset, y_offset, .. } |
1440
- PositionInfo :: Fixed { x_offset, y_offset, .. } => {
1441
- LogicalRect :: new ( LogicalPosition :: new ( x_offset, y_offset) , rect_size)
1442
- }
1443
- }
1444
- }
1445
-
1446
1433
#[ inline]
1447
1434
fn push_scroll_frame (
1448
1435
builder : & mut WrDisplayListBuilder ,
@@ -1458,7 +1445,7 @@ fn push_scroll_frame(
1458
1445
ComplexClipRegion as WrComplexClipRegion ,
1459
1446
} ;
1460
1447
1461
- let clip_rect = get_frame_clip_rect ( scroll_frame . frame . position , scroll_frame. frame . size ) ;
1448
+ let clip_rect = LogicalRect :: new ( LogicalPosition :: zero ( ) , scroll_frame. frame . size ) ;
1462
1449
1463
1450
// if let Some(image_mask) = scroll_frame.frame.image_mask { push_image_mask_clip() }
1464
1451
0 commit comments