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

Side by Side 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: Cleaned up for review 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef MediaConstraintsImpl_h 31 #ifndef MediaConstraintsImpl_h
32 #define MediaConstraintsImpl_h 32 #define MediaConstraintsImpl_h
33 33
34 #include "modules/ModulesExport.h"
34 #include "modules/mediastream/MediaErrorState.h" 35 #include "modules/mediastream/MediaErrorState.h"
35 #include "public/platform/WebMediaConstraints.h" 36 #include "public/platform/WebMediaConstraints.h"
36 #include "wtf/text/WTFString.h" 37 #include "wtf/text/WTFString.h"
37 38
38 namespace blink { 39 namespace blink {
39 40
40 class Dictionary; 41 class Dictionary;
41 class ExceptionState; 42 class ExceptionState;
Yuki 2016/05/24 10:01:03 nit: ExceptionState seems not used.
42 class MediaTrackConstraints; 43 class MediaTrackConstraints;
44 class MediaTrackConstraintSet;
Yuki 2016/05/24 10:01:03 nit: MediaTrackConstraintSet seems not used.
43 45
44 namespace MediaConstraintsImpl { 46 namespace MediaConstraintsImpl {
45 47
46 WebMediaConstraints create(); 48 WebMediaConstraints create();
47 WebMediaConstraints create(ExecutionContext*, const Dictionary&, MediaErrorState &); 49 WebMediaConstraints create(ExecutionContext*, const Dictionary&, MediaErrorState &);
48 WebMediaConstraints create(ExecutionContext*, const MediaTrackConstraints&, Medi aErrorState&); 50 WebMediaConstraints create(ExecutionContext*, const MediaTrackConstraints&, Medi aErrorState&);
49 51
50 void convertConstraints(const WebMediaConstraints& input, MediaTrackConstraints& output); 52 // Exported with MODULES_EXPORT for testing
53 MODULES_EXPORT void convertConstraints(const WebMediaConstraints& input, MediaTr ackConstraints& output);
54 // Exported for testing only.
55 MODULES_EXPORT WebMediaConstraints convertConstraintsToWeb(const MediaTrackConst raints&);
51 } 56 }
52 57
53 } // namespace blink 58 } // namespace blink
54 59
55 #endif // MediaConstraintsImpl_h 60 #endif // MediaConstraintsImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698