<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204847] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204847">204847</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 12:02:48 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Templatize MediaConstraint
https://bugs.webkit.org/show_bug.cgi?id=161092
Reviewed by Jer Noble.
No new tests, no functional change.
* platform/mediastream/MediaConstraints.cpp:
(WebCore::BooleanConstraint::getExact):
(WebCore::BooleanConstraint::getIdeal):
(WebCore::MediaConstraint::getMin): Deleted.
(WebCore::MediaConstraint::getMax): Deleted.
(WebCore::MediaConstraint::getExact): Deleted.
(WebCore::MediaConstraint::getIdeal): Deleted.
(WebCore::IntConstraint::create): Deleted.
(WebCore::IntConstraint::setMin): Deleted.
(WebCore::IntConstraint::setMax): Deleted.
(WebCore::IntConstraint::setExact): Deleted.
(WebCore::IntConstraint::setIdeal): Deleted.
(WebCore::IntConstraint::getMin): Deleted.
(WebCore::IntConstraint::getMax): Deleted.
(WebCore::IntConstraint::getExact): Deleted.
(WebCore::IntConstraint::getIdeal): Deleted.
(WebCore::DoubleConstraint::create): Deleted.
(WebCore::DoubleConstraint::setMin): Deleted.
(WebCore::DoubleConstraint::setMax): Deleted.
(WebCore::DoubleConstraint::setExact): Deleted.
(WebCore::DoubleConstraint::setIdeal): Deleted.
(WebCore::DoubleConstraint::getMin): Deleted.
(WebCore::DoubleConstraint::getMax): Deleted.
(WebCore::DoubleConstraint::getExact): Deleted.
(WebCore::DoubleConstraint::getIdeal): Deleted.
(WebCore::BooleanConstraint::create): Deleted.
(WebCore::BooleanConstraint::setExact): Deleted.
(WebCore::BooleanConstraint::setIdeal): Deleted.
(WebCore::StringConstraint::create): Deleted.
* platform/mediastream/MediaConstraints.h:
(WebCore::MediaConstraint::getMin):
(WebCore::MediaConstraint::getMax):
(WebCore::MediaConstraint::getExact):
(WebCore::MediaConstraint::getIdeal):
(WebCore::NumericConstraint::setMin):
(WebCore::NumericConstraint::setMax):
(WebCore::NumericConstraint::setExact):
(WebCore::NumericConstraint::setIdeal):
(WebCore::NumericConstraint::setHasMin): Deleted.
(WebCore::NumericConstraint::setHasMax): Deleted.
(WebCore::NumericConstraint::setHasExact): Deleted.
(WebCore::NumericConstraint::setHasIdeal): Deleted.
(WebCore::NumericConstraint::hasMin): Deleted.
(WebCore::NumericConstraint::hasMax): Deleted.
(WebCore::NumericConstraint::hasExact): Deleted.
(WebCore::NumericConstraint::hasIdeal): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaConstraintscpp">trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaConstraintsh">trunk/Source/WebCore/platform/mediastream/MediaConstraints.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204846 => 204847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-23 19:00:49 UTC (rev 204846)
+++ trunk/Source/WebCore/ChangeLog 2016-08-23 19:02:48 UTC (rev 204847)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2016-08-23 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Templatize MediaConstraint
+ https://bugs.webkit.org/show_bug.cgi?id=161092
+
+ Reviewed by Jer Noble.
+
+ No new tests, no functional change.
+
+ * platform/mediastream/MediaConstraints.cpp:
+ (WebCore::BooleanConstraint::getExact):
+ (WebCore::BooleanConstraint::getIdeal):
+ (WebCore::MediaConstraint::getMin): Deleted.
+ (WebCore::MediaConstraint::getMax): Deleted.
+ (WebCore::MediaConstraint::getExact): Deleted.
+ (WebCore::MediaConstraint::getIdeal): Deleted.
+ (WebCore::IntConstraint::create): Deleted.
+ (WebCore::IntConstraint::setMin): Deleted.
+ (WebCore::IntConstraint::setMax): Deleted.
+ (WebCore::IntConstraint::setExact): Deleted.
+ (WebCore::IntConstraint::setIdeal): Deleted.
+ (WebCore::IntConstraint::getMin): Deleted.
+ (WebCore::IntConstraint::getMax): Deleted.
+ (WebCore::IntConstraint::getExact): Deleted.
+ (WebCore::IntConstraint::getIdeal): Deleted.
+ (WebCore::DoubleConstraint::create): Deleted.
+ (WebCore::DoubleConstraint::setMin): Deleted.
+ (WebCore::DoubleConstraint::setMax): Deleted.
+ (WebCore::DoubleConstraint::setExact): Deleted.
+ (WebCore::DoubleConstraint::setIdeal): Deleted.
+ (WebCore::DoubleConstraint::getMin): Deleted.
+ (WebCore::DoubleConstraint::getMax): Deleted.
+ (WebCore::DoubleConstraint::getExact): Deleted.
+ (WebCore::DoubleConstraint::getIdeal): Deleted.
+ (WebCore::BooleanConstraint::create): Deleted.
+ (WebCore::BooleanConstraint::setExact): Deleted.
+ (WebCore::BooleanConstraint::setIdeal): Deleted.
+ (WebCore::StringConstraint::create): Deleted.
+ * platform/mediastream/MediaConstraints.h:
+ (WebCore::MediaConstraint::getMin):
+ (WebCore::MediaConstraint::getMax):
+ (WebCore::MediaConstraint::getExact):
+ (WebCore::MediaConstraint::getIdeal):
+ (WebCore::NumericConstraint::setMin):
+ (WebCore::NumericConstraint::setMax):
+ (WebCore::NumericConstraint::setExact):
+ (WebCore::NumericConstraint::setIdeal):
+ (WebCore::NumericConstraint::setHasMin): Deleted.
+ (WebCore::NumericConstraint::setHasMax): Deleted.
+ (WebCore::NumericConstraint::setHasExact): Deleted.
+ (WebCore::NumericConstraint::setHasIdeal): Deleted.
+ (WebCore::NumericConstraint::hasMin): Deleted.
+ (WebCore::NumericConstraint::hasMax): Deleted.
+ (WebCore::NumericConstraint::hasExact): Deleted.
+ (WebCore::NumericConstraint::hasIdeal): Deleted.
+
</ins><span class="cx"> 2016-08-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a workaround for iOS Frameworks that expect DOM bindings to be in WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaConstraintscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp (204846 => 204847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp 2016-08-23 19:00:49 UTC (rev 204846)
+++ trunk/Source/WebCore/platform/mediastream/MediaConstraints.cpp 2016-08-23 19:02:48 UTC (rev 204847)
</span><span class="lines">@@ -62,272 +62,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaConstraint::getMin(int&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMax(int&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getExact(int&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getIdeal(int&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMin(double&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMax(double&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getExact(double&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getIdeal(double&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMin(bool&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMax(bool&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getExact(bool&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getIdeal(bool&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMin(Vector<String>&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getMax(Vector<String>&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getExact(Vector<String>&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-bool MediaConstraint::getIdeal(Vector<String>&) const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-Ref<IntConstraint> IntConstraint::create(MediaConstraintType type)
-{
- return adoptRef(*new IntConstraint(type));
-}
-
-void IntConstraint::setMin(int value)
-{
- m_min = value;
- setHasMin(true);
-}
-
-void IntConstraint::setMax(int value)
-{
- m_max = value;
- setHasMax(true);
-}
-
-void IntConstraint::setExact(int value)
-{
- m_exact = value;
- setHasExact(true);
-}
-
-void IntConstraint::setIdeal(int value)
-{
- m_ideal = value;
- setHasIdeal(true);
-}
-
-bool IntConstraint::getMin(int& min) const
-{
- if (!hasMin())
- return false;
-
- min = m_min;
- return true;
-}
-
-bool IntConstraint::getMax(int& max) const
-{
- if (!hasMax())
- return false;
-
- max = m_max;
- return true;
-}
-
-bool IntConstraint::getExact(int& exact) const
-{
- if (!hasExact())
- return false;
-
- exact = m_exact;
- return true;
-}
-
-bool IntConstraint::getIdeal(int& ideal) const
-{
- if (!hasIdeal())
- return false;
-
- ideal = m_ideal;
- return true;
-}
-
-Ref<DoubleConstraint> DoubleConstraint::create(MediaConstraintType type)
-{
- return adoptRef(*new DoubleConstraint(type));
-}
-
-void DoubleConstraint::setMin(double value)
-{
- m_min = value;
- setHasMin(true);
-}
-
-void DoubleConstraint::setMax(double value)
-{
- m_max = value;
- setHasMax(true);
-}
-
-void DoubleConstraint::setExact(double value)
-{
- m_exact = value;
- setHasExact(true);
-}
-
-void DoubleConstraint::setIdeal(double value)
-{
- m_ideal = value;
- setHasIdeal(true);
-}
-
-bool DoubleConstraint::getMin(double& min) const
-{
- if (!hasMin())
- return false;
-
- min = m_min;
- return true;
-}
-
-bool DoubleConstraint::getMax(double& max) const
-{
- if (!hasMax())
- return false;
-
- max = m_max;
- return true;
-}
-
-bool DoubleConstraint::getExact(double& exact) const
-{
- if (!hasExact())
- return false;
-
- exact = m_exact;
- return true;
-}
-
-bool DoubleConstraint::getIdeal(double& ideal) const
-{
- if (!hasIdeal())
- return false;
-
- ideal = m_ideal;
- return true;
-}
-
-Ref<BooleanConstraint> BooleanConstraint::create(MediaConstraintType type)
-{
- return adoptRef(*new BooleanConstraint(type));
-}
-
-void BooleanConstraint::setExact(bool value)
-{
- m_exact = value;
- m_hasExact = true;
-}
-
-void BooleanConstraint::setIdeal(bool value)
-{
- m_ideal = value;
- m_hasIdeal = true;
-}
-
</del><span class="cx"> bool BooleanConstraint::getExact(bool& exact) const
</span><span class="cx"> {
</span><del>- if (!m_hasExact)
</del><ins>+ if (!m_exact)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- exact = m_exact;
</del><ins>+ exact = m_exact.value();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool BooleanConstraint::getIdeal(bool& ideal) const
</span><span class="cx"> {
</span><del>- if (!m_hasIdeal)
</del><ins>+ if (!m_ideal)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- ideal = m_ideal;
</del><ins>+ ideal = m_ideal.value();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StringConstraint> StringConstraint::create(MediaConstraintType type)
-{
- return adoptRef(*new StringConstraint(type));
-}
-
</del><span class="cx"> void StringConstraint::setExact(const String& value)
</span><span class="cx"> {
</span><span class="cx"> m_exact.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaConstraints.h (204846 => 204847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2016-08-23 19:00:49 UTC (rev 204846)
+++ trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2016-08-23 19:02:48 UTC (rev 204847)
</span><span class="lines">@@ -49,29 +49,28 @@
</span><span class="cx"> virtual bool isEmpty() const = 0;
</span><span class="cx"> virtual bool isMandatory() const = 0;
</span><span class="cx">
</span><del>- virtual bool getMin(int&) const;
- virtual bool getMax(int&) const;
- virtual bool getExact(int&) const;
- virtual bool getIdeal(int&) const;
</del><ins>+ virtual bool getMin(int&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getMax(int&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getExact(int&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getIdeal(int&) const { ASSERT_NOT_REACHED(); return false; }
</ins><span class="cx">
</span><del>- virtual bool getMin(double&) const;
- virtual bool getMax(double&) const;
- virtual bool getExact(double&) const;
- virtual bool getIdeal(double&) const;
</del><ins>+ virtual bool getMin(double&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getMax(double&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getExact(double&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getIdeal(double&) const { ASSERT_NOT_REACHED(); return false; }
</ins><span class="cx">
</span><del>- virtual bool getMin(bool&) const;
- virtual bool getMax(bool&) const;
- virtual bool getExact(bool&) const;
- virtual bool getIdeal(bool&) const;
</del><ins>+ virtual bool getMin(bool&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getMax(bool&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getExact(bool&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getIdeal(bool&) const { ASSERT_NOT_REACHED(); return false; }
</ins><span class="cx">
</span><del>- virtual bool getMin(Vector<String>&) const;
- virtual bool getMax(Vector<String>&) const;
- virtual bool getExact(Vector<String>&) const;
- virtual bool getIdeal(Vector<String>&) const;
</del><ins>+ virtual bool getMin(Vector<String>&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getMax(Vector<String>&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getExact(Vector<String>&) const { ASSERT_NOT_REACHED(); return false; }
+ virtual bool getIdeal(Vector<String>&) const { ASSERT_NOT_REACHED(); return false; }
</ins><span class="cx">
</span><span class="cx"> MediaConstraintType type() const { return m_type; }
</span><span class="cx">
</span><del>-
</del><span class="cx"> protected:
</span><span class="cx"> explicit MediaConstraint(MediaConstraintType type)
</span><span class="cx"> : m_type(type)
</span><span class="lines">@@ -82,11 +81,49 @@
</span><span class="cx"> MediaConstraintType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class ValueType>
</ins><span class="cx"> class NumericConstraint : public MediaConstraint {
</span><span class="cx"> public:
</span><del>- bool isEmpty() const override { return !m_hasMin && !m_hasMax && !m_hasExact && !m_hasIdeal; }
- bool isMandatory() const override { return m_hasMin || m_hasMax || m_hasExact; }
</del><ins>+ bool isEmpty() const override { return !m_min && !m_max && !m_exact && !m_ideal; }
+ bool isMandatory() const override { return m_min || m_max || m_exact; }
</ins><span class="cx">
</span><ins>+ void setMin(ValueType value) { m_min = value; }
+ void setMax(ValueType value) { m_max = value; }
+ void setExact(ValueType value) { m_exact = value; }
+ void setIdeal(ValueType value) { m_ideal = value; }
+
+ bool getMin(ValueType& min) const final {
+ if (!m_min)
+ return false;
+
+ min = m_min.value();
+ return true;
+ }
+
+ bool getMax(ValueType& max) const final {
+ if (!m_max)
+ return false;
+
+ max = m_max.value();
+ return true;
+ }
+
+ bool getExact(ValueType& exact) const final {
+ if (!m_exact)
+ return false;
+
+ exact = m_exact.value();
+ return true;
+ }
+
+ bool getIdeal(ValueType& ideal) const final {
+ if (!m_ideal)
+ return false;
+
+ ideal = m_ideal.value();
+ return true;
+ }
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit NumericConstraint(MediaConstraintType type)
</span><span class="cx"> : MediaConstraint(type)
</span><span class="lines">@@ -93,87 +130,47 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setHasMin(bool value) { m_hasMin = value; }
- void setHasMax(bool value) { m_hasMax = value; }
- void setHasExact(bool value) { m_hasExact = value; }
- void setHasIdeal(bool value) { m_hasIdeal = value; }
-
- bool hasMin() const { return m_hasMin; }
- bool hasMax() const { return m_hasMax; }
- bool hasExact() const { return m_hasExact; }
- bool hasIdeal() const { return m_hasIdeal; }
-
</del><span class="cx"> private:
</span><del>- bool m_hasMin { false };
- bool m_hasMax { false };
- bool m_hasExact { false };
- bool m_hasIdeal { false };
</del><ins>+ Optional<ValueType> m_min;
+ Optional<ValueType> m_max;
+ Optional<ValueType> m_exact;
+ Optional<ValueType> m_ideal;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class IntConstraint final : public NumericConstraint {
</del><ins>+class IntConstraint final : public NumericConstraint<int> {
</ins><span class="cx"> public:
</span><del>- static Ref<IntConstraint> create(MediaConstraintType);
</del><ins>+ static Ref<IntConstraint> create(MediaConstraintType type) { return adoptRef(*new IntConstraint(type)); }
</ins><span class="cx">
</span><del>- void setMin(int value);
- void setMax(int value);
- void setExact(int value);
- void setIdeal(int value);
-
- bool getMin(int&) const final;
- bool getMax(int&) const final;
- bool getExact(int&) const final;
- bool getIdeal(int&) const final;
-
</del><span class="cx"> private:
</span><span class="cx"> explicit IntConstraint(MediaConstraintType type)
</span><del>- : WebCore::NumericConstraint(type)
</del><ins>+ : NumericConstraint<int>(type)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>-
- int m_min;
- int m_max;
- int m_exact;
- int m_ideal;
</del><span class="cx"> };
</span><span class="cx">
</span><del>-class DoubleConstraint final : public NumericConstraint {
</del><ins>+class DoubleConstraint final : public NumericConstraint<double> {
</ins><span class="cx"> public:
</span><del>- static Ref<DoubleConstraint> create(MediaConstraintType);
</del><ins>+ static Ref<DoubleConstraint> create(MediaConstraintType type) { return adoptRef(*new DoubleConstraint(type)); }
</ins><span class="cx">
</span><del>- void setMin(double value);
- void setMax(double value);
- void setExact(double value);
- void setIdeal(double value);
-
- bool getMin(double&) const final;
- bool getMax(double&) const final;
- bool getExact(double&) const final;
- bool getIdeal(double&) const final;
-
</del><span class="cx"> private:
</span><span class="cx"> explicit DoubleConstraint(MediaConstraintType type)
</span><del>- : WebCore::NumericConstraint(type)
</del><ins>+ : NumericConstraint<double>(type)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>-
- double m_min;
- double m_max;
- double m_exact;
- double m_ideal;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class BooleanConstraint final : public MediaConstraint {
</span><span class="cx"> public:
</span><del>- static Ref<BooleanConstraint> create(MediaConstraintType);
</del><ins>+ static Ref<BooleanConstraint> create(MediaConstraintType type) { return adoptRef(*new BooleanConstraint(type)); }
</ins><span class="cx">
</span><del>- void setExact(bool value);
- void setIdeal(bool value);
</del><ins>+ void setExact(bool value) { m_exact = value; }
+ void setIdeal(bool value) { m_ideal = value; }
</ins><span class="cx">
</span><span class="cx"> bool getExact(bool&) const final;
</span><span class="cx"> bool getIdeal(bool&) const final;
</span><span class="cx">
</span><del>- bool isEmpty() const final { return !m_hasExact && !m_hasIdeal; };
- bool isMandatory() const final { return m_hasExact; }
</del><ins>+ bool isEmpty() const final { return !m_exact && !m_ideal; };
+ bool isMandatory() const final { return bool(m_exact); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit BooleanConstraint(MediaConstraintType type)
</span><span class="lines">@@ -181,15 +178,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool m_exact { false };
- bool m_ideal { false };
- bool m_hasExact { false };
- bool m_hasIdeal { false };
</del><ins>+ Optional<bool> m_exact { false };
+ Optional<bool> m_ideal { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StringConstraint final : public MediaConstraint {
</span><span class="cx"> public:
</span><del>- static Ref<StringConstraint> create(MediaConstraintType);
</del><ins>+ static Ref<StringConstraint> create(MediaConstraintType type) { return adoptRef(*new StringConstraint(type)); }
</ins><span class="cx">
</span><span class="cx"> void setExact(const String&);
</span><span class="cx"> void appendExact(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>