Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not use WR external images if frames are not textures

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-07-02 13:19:02 +02:00
parent cd17b6ca66
commit 89dc0119f0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,12 +207,12 @@ impl FrameRenderer for MediaFrameRenderer {
*width = frame.get_width(); *width = frame.get_width();
*height = frame.get_height(); *height = frame.get_height();
let image_data = if let Some(player_id) = self.player_id { let image_data = if frame.is_gl_texture() && self.player_id.is_some() {
self.current_frame_holder self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone())) .get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame); .set(frame);
ImageData::External(ExternalImageData { ImageData::External(ExternalImageData {
id: ExternalImageId(player_id), id: ExternalImageId(self.player_id.unwrap()),
channel_index: 0, channel_index: 0,
image_type: ExternalImageType::TextureHandle(TextureTarget::Default), image_type: ExternalImageType::TextureHandle(TextureTarget::Default),
}) })
@ -225,10 +225,10 @@ impl FrameRenderer for MediaFrameRenderer {
let image_key = self.api.generate_image_key(); let image_key = self.api.generate_image_key();
self.current_frame = Some((image_key, frame.get_width(), frame.get_height())); self.current_frame = Some((image_key, frame.get_width(), frame.get_height()));
let image_data = if let Some(player_id) = self.player_id { let image_data = if frame.is_gl_texture() && self.player_id.is_some() {
self.current_frame_holder = Some(FrameHolder::new(frame)); self.current_frame_holder = Some(FrameHolder::new(frame));
ImageData::External(ExternalImageData { ImageData::External(ExternalImageData {
id: ExternalImageId(player_id), id: ExternalImageId(self.player_id.unwrap()),
channel_index: 0, channel_index: 0,
image_type: ExternalImageType::TextureHandle(TextureTarget::Default), image_type: ExternalImageType::TextureHandle(TextureTarget::Default),
}) })