| Index: third_party/WebKit/Source/web/WebUserMediaRequest.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebUserMediaRequest.cpp b/third_party/WebKit/Source/web/WebUserMediaRequest.cpp
|
| index b13ac15a7d071afe547d6af0ea4861f28476c581..51ed8699cf5b57b747e169cc2da162b485771c4f 100644
|
| --- a/third_party/WebKit/Source/web/WebUserMediaRequest.cpp
|
| +++ b/third_party/WebKit/Source/web/WebUserMediaRequest.cpp
|
| @@ -62,31 +62,31 @@ void WebUserMediaRequest::reset()
|
|
|
| bool WebUserMediaRequest::audio() const
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| return m_private->audio();
|
| }
|
|
|
| bool WebUserMediaRequest::video() const
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| return m_private->video();
|
| }
|
|
|
| WebMediaConstraints WebUserMediaRequest::audioConstraints() const
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| return m_private->audioConstraints();
|
| }
|
|
|
| WebMediaConstraints WebUserMediaRequest::videoConstraints() const
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| return m_private->videoConstraints();
|
| }
|
|
|
| WebSecurityOrigin WebUserMediaRequest::getSecurityOrigin() const
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| if (!m_private->getExecutionContext())
|
| return WebSecurityOrigin::createFromString("test://test");
|
| return WebSecurityOrigin(m_private->getExecutionContext()->getSecurityOrigin());
|
| @@ -94,31 +94,32 @@ WebSecurityOrigin WebUserMediaRequest::getSecurityOrigin() const
|
|
|
| WebDocument WebUserMediaRequest::ownerDocument() const
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| return WebDocument(m_private->ownerDocument());
|
| }
|
|
|
| void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescriptor)
|
| {
|
| - ASSERT(!isNull() && !streamDescriptor.isNull());
|
| + DCHECK(!isNull());
|
| + DCHECK(!streamDescriptor.isNull());
|
| m_private->succeed(streamDescriptor);
|
| }
|
|
|
| void WebUserMediaRequest::requestDenied(const WebString& description)
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| m_private->failPermissionDenied(description);
|
| }
|
|
|
| void WebUserMediaRequest::requestFailedConstraint(const WebString& constraintName, const WebString& description)
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| m_private->failConstraint(constraintName, description);
|
| }
|
|
|
| void WebUserMediaRequest::requestFailedUASpecific(const WebString& name, const WebString& constraintName, const WebString& description)
|
| {
|
| - ASSERT(!isNull());
|
| + DCHECK(!isNull());
|
| m_private->failUASpecific(name, constraintName, description);
|
| }
|
|
|
|
|