mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1181896 - rename .constraintName to .constraint in MediaStreamError r=jesup,bz
This commit is contained in:
parent
60070e8c0e
commit
ae4ce903b9
@ -953,8 +953,8 @@ GetSources(MediaEngine *engine, dom::MediaSourceEnum aSrcType,
|
||||
|
||||
template<class DeviceType>
|
||||
static void
|
||||
ApplyConstraints(const MediaTrackConstraints &aConstraints,
|
||||
nsTArray<nsRefPtr<DeviceType>>& aSources)
|
||||
SelectSettings(const MediaTrackConstraints &aConstraints,
|
||||
nsTArray<nsRefPtr<DeviceType>>& aSources)
|
||||
{
|
||||
auto& c = aConstraints;
|
||||
|
||||
@ -1009,8 +1009,8 @@ ApplyConstraints(const MediaTrackConstraints &aConstraints,
|
||||
}
|
||||
|
||||
static bool
|
||||
ApplyConstraints(MediaStreamConstraints &aConstraints,
|
||||
nsTArray<nsRefPtr<MediaDevice>>& aSources)
|
||||
SelectSettings(MediaStreamConstraints &aConstraints,
|
||||
nsTArray<nsRefPtr<MediaDevice>>& aSources)
|
||||
{
|
||||
// Since the advanced part of the constraints algorithm needs to know when
|
||||
// a candidate set is overconstrained (zero members), we must split up the
|
||||
@ -1033,7 +1033,7 @@ ApplyConstraints(MediaStreamConstraints &aConstraints,
|
||||
MOZ_ASSERT(!aSources.Length());
|
||||
|
||||
if (IsOn(aConstraints.mVideo)) {
|
||||
ApplyConstraints(GetInvariant(aConstraints.mVideo), videos);
|
||||
SelectSettings(GetInvariant(aConstraints.mVideo), videos);
|
||||
if (!videos.Length()) {
|
||||
overconstrained = true;
|
||||
}
|
||||
@ -1042,7 +1042,7 @@ ApplyConstraints(MediaStreamConstraints &aConstraints,
|
||||
}
|
||||
}
|
||||
if (IsOn(aConstraints.mAudio)) {
|
||||
ApplyConstraints(GetInvariant(aConstraints.mAudio), audios);
|
||||
SelectSettings(GetInvariant(aConstraints.mAudio), audios);
|
||||
if (!audios.Length()) {
|
||||
overconstrained = true;
|
||||
}
|
||||
@ -1906,7 +1906,7 @@ MediaManager::GetUserMedia(nsPIDOMWindow* aWindow,
|
||||
|
||||
// Apply any constraints. This modifies the list.
|
||||
|
||||
if (!ApplyConstraints(c, *devices)) {
|
||||
if (!SelectSettings(c, *devices)) {
|
||||
nsRefPtr<MediaStreamError> error =
|
||||
new MediaStreamError(window, NS_LITERAL_STRING("NotFoundError"));
|
||||
onFailure->OnError(error);
|
||||
|
@ -12,10 +12,10 @@ namespace mozilla {
|
||||
|
||||
BaseMediaMgrError::BaseMediaMgrError(const nsAString& aName,
|
||||
const nsAString& aMessage,
|
||||
const nsAString& aConstraintName)
|
||||
const nsAString& aConstraint)
|
||||
: mName(aName)
|
||||
, mMessage(aMessage)
|
||||
, mConstraintName(aConstraintName)
|
||||
, mConstraint(aConstraint)
|
||||
{
|
||||
if (mMessage.IsEmpty()) {
|
||||
if (mName.EqualsLiteral("NotFoundError")) {
|
||||
@ -43,8 +43,8 @@ MediaStreamError::MediaStreamError(
|
||||
nsPIDOMWindow* aParent,
|
||||
const nsAString& aName,
|
||||
const nsAString& aMessage,
|
||||
const nsAString& aConstraintName)
|
||||
: BaseMediaMgrError(aName, aMessage, aConstraintName)
|
||||
const nsAString& aConstraint)
|
||||
: BaseMediaMgrError(aName, aMessage, aConstraint)
|
||||
, mParent(aParent) {}
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MediaStreamError, mParent)
|
||||
@ -75,9 +75,9 @@ MediaStreamError::GetMessage(nsAString& aMessage) const
|
||||
}
|
||||
|
||||
void
|
||||
MediaStreamError::GetConstraintName(nsAString& aConstraintName) const
|
||||
MediaStreamError::GetConstraint(nsAString& aConstraint) const
|
||||
{
|
||||
aConstraintName = mConstraintName;
|
||||
aConstraint = mConstraint;
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
@ -34,10 +34,10 @@ class BaseMediaMgrError
|
||||
protected:
|
||||
BaseMediaMgrError(const nsAString& aName,
|
||||
const nsAString& aMessage,
|
||||
const nsAString& aConstraintName);
|
||||
const nsAString& aConstraint);
|
||||
const nsString mName;
|
||||
nsString mMessage;
|
||||
const nsString mConstraintName;
|
||||
const nsString mConstraint;
|
||||
};
|
||||
|
||||
class MediaMgrError final : public nsISupports,
|
||||
@ -46,8 +46,8 @@ class MediaMgrError final : public nsISupports,
|
||||
public:
|
||||
explicit MediaMgrError(const nsAString& aName,
|
||||
const nsAString& aMessage = EmptyString(),
|
||||
const nsAString& aConstraintName = EmptyString())
|
||||
: BaseMediaMgrError(aName, aMessage, aConstraintName) {}
|
||||
const nsAString& aConstraint = EmptyString())
|
||||
: BaseMediaMgrError(aName, aMessage, aConstraint) {}
|
||||
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
|
||||
@ -64,11 +64,11 @@ public:
|
||||
MediaStreamError(nsPIDOMWindow* aParent,
|
||||
const nsAString& aName,
|
||||
const nsAString& aMessage = EmptyString(),
|
||||
const nsAString& aConstraintName = EmptyString());
|
||||
const nsAString& aConstraint = EmptyString());
|
||||
|
||||
MediaStreamError(nsPIDOMWindow* aParent,
|
||||
const BaseMediaMgrError& aOther)
|
||||
: BaseMediaMgrError(aOther.mName, aOther.mMessage, aOther.mConstraintName)
|
||||
: BaseMediaMgrError(aOther.mName, aOther.mMessage, aOther.mConstraint)
|
||||
, mParent(aParent) {}
|
||||
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
@ -83,7 +83,7 @@ public:
|
||||
}
|
||||
void GetName(nsAString& aName) const;
|
||||
void GetMessage(nsAString& aMessage) const;
|
||||
void GetConstraintName(nsAString& aConstraintName) const;
|
||||
void GetConstraint(nsAString& aConstraint) const;
|
||||
|
||||
private:
|
||||
virtual ~MediaStreamError() {}
|
||||
|
@ -17,5 +17,5 @@
|
||||
interface MediaStreamError {
|
||||
readonly attribute DOMString name;
|
||||
readonly attribute DOMString? message;
|
||||
readonly attribute DOMString? constraintName;
|
||||
readonly attribute DOMString? constraint;
|
||||
};
|
||||
|
@ -37,6 +37,9 @@ typedef (double or ConstrainDoubleRange) ConstrainDouble;
|
||||
typedef (boolean or ConstrainBooleanParameters) ConstrainBoolean;
|
||||
typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) ConstrainDOMString;
|
||||
|
||||
// Note: When adding new constraints, remember to update the SelectSettings()
|
||||
// function in MediaManager.cpp to make OverconstrainedError's constraint work!
|
||||
|
||||
dictionary MediaTrackConstraintSet {
|
||||
ConstrainLong width;
|
||||
ConstrainLong height;
|
||||
|
Loading…
Reference in New Issue
Block a user