third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h - Issue 1977513004: Adds multiple forms of MediaStreamTrack constraints

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: third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h

Issue 1977513004: Adds multiple forms of MediaStreamTrack constraints (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Tommi's comments Created 4 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

« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/ConstrainDOMStringParameters.idl ('k') | third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h

diff --git a/third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h b/third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h

index 02c46a2b61eefead6b1326812e59df98efd591c2..615ee09bc6e37359014f2ad39a0654766ddf8fb0 100644

--- a/third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h

+++ b/third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.h

@@ -31,6 +31,7 @@

#ifndef MediaConstraintsImpl_h

#define MediaConstraintsImpl_h

+#include "modules/ModulesExport.h"

#include "modules/mediastream/MediaErrorState.h"

#include "public/platform/WebMediaConstraints.h"

#include "wtf/text/WTFString.h"

@@ -38,7 +39,6 @@

namespace blink {

class Dictionary;

-class ExceptionState;

class MediaTrackConstraints;

namespace MediaConstraintsImpl {

@@ -47,7 +47,10 @@ WebMediaConstraints create();

WebMediaConstraints create(ExecutionContext*, const Dictionary&, MediaErrorState&);

WebMediaConstraints create(ExecutionContext*, const MediaTrackConstraints&, MediaErrorState&);

-void convertConstraints(const WebMediaConstraints& input, MediaTrackConstraints& output);

+// Exported with MODULES_EXPORT for testing

+MODULES_EXPORT void convertConstraints(const WebMediaConstraints& input, MediaTrackConstraints& output);

+// Exported for testing only.

+MODULES_EXPORT WebMediaConstraints convertConstraintsToWeb(const MediaTrackConstraints&);

}

} // namespace blink