media/media.gyp - Issue 265993002: Add Promises for EME (Chromium side)

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: media/media.gyp

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: latest CDM_5 Created 6 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:

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index c42d2704d8ee8418c1af750f885caeab4bc93c85..9a99ff0bdb8c5aab420a653a1002fe3fda70fb1c 100644

--- a/media/media.gyp

+++ b/media/media.gyp

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

'type': '<(component)',

'dependencies': [

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

- '../base/base.gyp:base_i18n',

+ '../base/base.gyp:base_i18n',

'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

'../crypto/crypto.gyp:crypto',

'../gpu/gpu.gyp:command_buffer_common',

@@ -258,6 +258,8 @@

'base/clock.h',

'base/container_names.cc',

'base/container_names.h',

+ 'base/cdm_promise.cc',

+ 'base/cdm_promise.h',

'base/data_buffer.cc',

'base/data_buffer.h',

'base/data_source.cc',

@@ -1498,7 +1500,7 @@

'type': 'executable',

'dependencies': [

'media',

- 'shared_memory_support',

+ 'shared_memory_support',

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

'../ui/gl/gl.gyp:gl',

'../ui/gfx/gfx.gyp:gfx',