content/content_tests.gypi - Issue 175223003: HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl

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: content/content_tests.gypi

Issue 175223003: HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl (Closed) Base URL: https://git.chromium.org/chromium/src.git@master

Patch Set: Make GpuVideoAcceleratorFactories::ReadPixels() receive mailbox, instead of texture Created 6 years, 9 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

« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | content/renderer/media/renderer_gpu_video_accelerator_factories.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index c34b779b70bfd3ffdfd95b5a706688412711777b..2ce91e5daf5cc6254b24752ce073328ecd522229 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -1264,13 +1264,14 @@

}],

- ['chromeos==1 or OS=="win" or OS=="android"', {

+ ['(chromeos==1 or (OS=="linux" and use_x11==1 and target_arch != "arm")) or OS=="win" or OS=="android"', {

'targets': [

{

'target_name': 'video_decode_accelerator_unittest',

'type': '<(gtest_target_type)',

'dependencies': [

'content.gyp:content',

+ 'test_support_content',

'../base/base.gyp:base',

'../testing/gtest.gyp:gtest',

'../media/media.gyp:media',

@@ -1337,13 +1338,14 @@

]

}],

- ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', {

+ ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', {