Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 1134643002: Add distinction between RGB and RGBA native texture video frames and resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test breakage from bad merge Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index c1436e5368208f84ce8d2c4e69e52d5ba085c3b7..71c9ea0fe632e32aa795d582509bd03ce9f6bbdb 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -1078,11 +1078,13 @@ class LayerTreeHostContextTestDontUseLostResources
hw_video_frame_ = VideoFrame::WrapNativeTexture(
gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point),
media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
- gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta(), false);
+ gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta(),
+ false /* allow_overlay */, true /* has_alpha */);
scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture(
gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point),
media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
- gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(), false);
+ gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(),
+ false /* allow_overlay */, true /* has_alpha */);
color_frame_provider_.set_frame(color_video_frame_);
hw_frame_provider_.set_frame(hw_video_frame_);
« no previous file with comments | « cc/resources/video_resource_updater_unittest.cc ('k') | content/browser/media/capture/aura_window_capture_machine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698