Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always hold current frame

Browse source 
Regardless if it contains raw data or a gl texture.

It is required to hold current frame because it can be used for
webgl's get_image_pixels
This commit is contained in:
Víctor Manuel Jáquez Leal 2019-09-17 18:04:50 +02:00
parent dc65d825e8
commit bc07154e05
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/dom/htmlmediaelement.rs
View file

@ -193,12 +193,12 @@ impl FrameRenderer for MediaFrameRenderer {
ImageData::Raw(frame.get_data()),
&webrender_api::DirtyRect::All,
);
} else if self.player_id.is_some() {
self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);
}
self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);
if let Some(old_image_key) = self.old_frame.take() {
txn.delete_image(old_image_key);
}
@ -220,9 +220,6 @@ impl FrameRenderer for MediaFrameRenderer {
TextureTarget::Default
};
self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);
ImageData::External(ExternalImageData {
id: ExternalImageId(self.player_id.unwrap()),
channel_index: 0,
@ -231,6 +228,11 @@ impl FrameRenderer for MediaFrameRenderer {
} else {
ImageData::Raw(frame.get_data())
};
self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);
txn.add_image(new_image_key, descriptor, image_data, None);
},
None => {
@ -244,7 +246,6 @@ impl FrameRenderer for MediaFrameRenderer {
TextureTarget::Default
};
self.current_frame_holder = Some(FrameHolder::new(frame));
ImageData::External(ExternalImageData {
id: ExternalImageId(self.player_id.unwrap()),
channel_index: 0,
@ -253,6 +254,9 @@ impl FrameRenderer for MediaFrameRenderer {
} else {
ImageData::Raw(frame.get_data())
};
self.current_frame_holder = Some(FrameHolder::new(frame));
txn.add_image(image_key, descriptor, image_data, None);
},
}