diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebKit/chromium/src/WebUserMediaRequest.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebKit/chromium/src/WebUserMediaRequest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebUserMediaRequest.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp index dcd270385..c9c0eccb3 100644 --- a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp +++ b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp @@ -36,11 +36,13 @@ #include "Document.h" #include "Frame.h" +#include "MediaStreamDescriptor.h" #include "MediaStreamSource.h" #include "Page.h" #include "SecurityOrigin.h" #include "UserMediaRequest.h" #include "WebSecurityOrigin.h" +#include "platform/WebMediaStreamDescriptor.h" #include "platform/WebMediaStreamSource.h" #include "platform/WebString.h" #include "platform/WebVector.h" @@ -95,6 +97,15 @@ void WebUserMediaRequest::requestSucceeded(const WebVector<WebMediaStreamSource> m_private->succeed(audio, video); } +void WebUserMediaRequest::requestSucceeded(const WebMediaStreamDescriptor& streamDescriptor) +{ + ASSERT(!streamDescriptor.isNull()); + if (m_private.isNull()) + return; + + m_private->succeed(streamDescriptor); +} + void WebUserMediaRequest::requestFailed() { m_private->fail(); @@ -109,10 +120,7 @@ bool WebUserMediaRequest::equals(const WebUserMediaRequest& other) const void WebUserMediaRequest::assign(const WebUserMediaRequest& other) { - UserMediaRequest* p = other.m_private.get(); - if (p) - p->ref(); - m_private = p; + m_private = other.m_private; } WebUserMediaRequest::operator UserMediaRequest*() const |