diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/mediastream/MediaConstraints.h | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/mediastream/MediaConstraints.h')
-rw-r--r-- | Source/WebCore/platform/mediastream/MediaConstraints.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Source/WebCore/platform/mediastream/MediaConstraints.h b/Source/WebCore/platform/mediastream/MediaConstraints.h index f285c579b..5141c228d 100644 --- a/Source/WebCore/platform/mediastream/MediaConstraints.h +++ b/Source/WebCore/platform/mediastream/MediaConstraints.h @@ -38,12 +38,23 @@ namespace WebCore { +struct MediaConstraint { + MediaConstraint(String name, String value) + : m_name(name) + , m_value(value) + { + } + + String m_name; + String m_value; +}; + class MediaConstraints : public RefCounted<MediaConstraints> { public: virtual ~MediaConstraints() { } - virtual void getMandatoryConstraintNames(Vector<String>& names) const = 0; - virtual void getOptionalConstraintNames(Vector<String>& names) const = 0; + virtual void getMandatoryConstraints(Vector<MediaConstraint>&) const = 0; + virtual void getOptionalConstraints(Vector<MediaConstraint>&) const = 0; virtual bool getMandatoryConstraintValue(const String& name, String& value) const = 0; virtual bool getOptionalConstraintValue(const String& name, String& value) const = 0; |