cc/resources/video_resource_updater.cc - Issue 885443002: Roll Chrome into Mojo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/resources/video_resource_updater.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Rebase to ToT mojo Created 5 years, 11 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:

Index: cc/resources/video_resource_updater.cc

diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc

index 4369e080576ce1048fd8157d7a180fec26188fc6..63750574a4f72ad3097e1703bf6ed8990ad2138f 100644

--- a/cc/resources/video_resource_updater.cc

+++ b/cc/resources/video_resource_updater.cc

@@ -7,7 +7,7 @@

#include <algorithm>

#include "base/bind.h"

-#include "base/debug/trace_event.h"

+#include "base/trace_event/trace_event.h"

#include "cc/output/gl_renderer.h"

#include "cc/resources/resource_provider.h"

#include "gpu/GLES2/gl2extchromium.h"

@@ -388,6 +388,8 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForHardwarePlanes(

TextureMailbox(mailbox_holder->mailbox,

mailbox_holder->texture_target,

mailbox_holder->sync_point));

+ external_resources.mailboxes.back().set_allow_overlay(

+ video_frame->allow_overlay());

external_resources.release_callbacks.push_back(

base::Bind(&ReturnTexture, AsWeakPtr(), video_frame));

return external_resources;