[chromium] MediaStream API: Adding the embedding code for MediaStreamCenter
authortommyw@google.com <tommyw@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Feb 2012 20:53:58 +0000 (20:53 +0000)
committertommyw@google.com <tommyw@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Feb 2012 20:53:58 +0000 (20:53 +0000)
commite0a87f619d8ddb33dbe065d0ab76e973efe8e2fa
treeb16607f93898671b06deabd702bbadee9d66d46d
parentedaf07578efb9c46337ab57b6d82276b056c119c
[chromium] MediaStream API: Adding the embedding code for MediaStreamCenter
https://bugs.webkit.org/show_bug.cgi?id=73130

Reviewed by Darin Fisher.

Source/WebCore:

Tests for the Media Stream API will be provided by the bug 56587, pending enough landed code.

* mediastream/UserMediaClient.h:
(UserMediaClient):
* mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::didCompleteQuery):
* mediastream/UserMediaRequest.h:
(UserMediaRequest):
(WebCore::UserMediaRequest::audio):
(WebCore::UserMediaRequest::video):
(WebCore::UserMediaRequest::cameraPreferenceUser):
(WebCore::UserMediaRequest::cameraPreferenceEnvironment):
* platform/mediastream/MediaStreamCenter.cpp:
(WebCore):
(WebCore::MediaStreamCenter::queryMediaStreamSources):
* platform/mediastream/MediaStreamCenter.h:
(WebCore):
(MediaStreamSourcesQueryClient):
(MediaStreamCenter):

Source/WebKit/chromium:

* WebKit.gyp:
* bridge/MediaStreamCenter.cpp: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebCore):
(WebCore::MediaStreamCenter::MediaStreamCenter):
(WebCore::MediaStreamCenter::~MediaStreamCenter):
(WebCore::MediaStreamCenter::queryMediaStreamSources):
(WebCore::MediaStreamCenter::didSetMediaStreamTrackEnabled):
(WebCore::MediaStreamCenter::didStopLocalMediaStream):
(WebCore::MediaStreamCenter::didConstructMediaStream):
* bridge/MediaStreamCenterInternal.cpp: Added.
(WebCore):
(WebCore::MediaStreamCenterInternal::MediaStreamCenterInternal):
(WebCore::MediaStreamCenterInternal::~MediaStreamCenterInternal):
(WebCore::MediaStreamCenterInternal::queryMediaStreamSources):
(WebCore::MediaStreamCenterInternal::didSetMediaStreamTrackEnabled):
(WebCore::MediaStreamCenterInternal::didStopLocalMediaStream):
(WebCore::MediaStreamCenterInternal::didConstructMediaStream):
(WebCore::MediaStreamCenterInternal::stopLocalMediaStream):
* bridge/MediaStreamCenterInternal.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebKit):
(WebCore):
(MediaStreamCenterInternal):
* public/platform/WebKitPlatformSupport.h:
(WebKit):
(WebKit::WebKitPlatformSupport::createMediaStreamCenter):
* public/platform/WebMediaStreamCenter.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebKit):
(WebMediaStreamCenter):
(WebKit::WebMediaStreamCenter::~WebMediaStreamCenter):
* public/platform/WebMediaStreamCenterClient.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebKit):
(WebMediaStreamCenterClient):
(WebKit::WebMediaStreamCenterClient::~WebMediaStreamCenterClient):
* public/platform/WebMediaStreamComponent.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebCore):
(WebKit):
(WebMediaStreamComponent):
(WebKit::WebMediaStreamComponent::WebMediaStreamComponent):
(WebKit::WebMediaStreamComponent::~WebMediaStreamComponent):
(WebKit::WebMediaStreamComponent::isNull):
* public/platform/WebMediaStreamDescriptor.h:
(WebKit):
(WebMediaStreamDescriptor):
* public/platform/WebMediaStreamSourcesRequest.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebCore):
(WebKit):
(WebMediaStreamSourcesRequest):
(WebKit::WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest):
(WebKit::WebMediaStreamSourcesRequest::~WebMediaStreamSourcesRequest):
(WebKit::WebMediaStreamSourcesRequest::isNull):
* src/UserMediaClientImpl.h:
(UserMediaClientImpl):
* src/WebMediaStreamComponent.cpp: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebKit):
(WebKit::WebMediaStreamComponent::WebMediaStreamComponent):
(WebKit::WebMediaStreamComponent::operator=):
(WebKit::WebMediaStreamComponent::reset):
(WebKit::WebMediaStreamComponent::operator PassRefPtr<MediaStreamComponent>):
(WebKit::WebMediaStreamComponent::operator MediaStreamComponent*):
(WebKit::WebMediaStreamComponent::isEnabled):
(WebKit::WebMediaStreamComponent::source):
* src/WebMediaStreamDescriptor.cpp:
(WebKit::WebMediaStreamDescriptor::WebMediaStreamDescriptor):
(WebKit):
(WebKit::WebMediaStreamDescriptor::audioSources):
(WebKit::WebMediaStreamDescriptor::videoSources):
* src/WebMediaStreamSourcesRequest.cpp: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h.
(WebKit):
(WebKit::WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest):
(WebKit::WebMediaStreamSourcesRequest::reset):
(WebKit::WebMediaStreamSourcesRequest::audio):
(WebKit::WebMediaStreamSourcesRequest::video):
(WebKit::WebMediaStreamSourcesRequest::didCompleteQuery):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106581 268f45cc-cd09-0410-ab3c-d52691b4dbfc
21 files changed:
Source/WebCore/ChangeLog
Source/WebCore/mediastream/UserMediaClient.h
Source/WebCore/mediastream/UserMediaRequest.cpp
Source/WebCore/mediastream/UserMediaRequest.h
Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
Source/WebCore/platform/mediastream/MediaStreamCenter.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/bridge/MediaStreamCenter.cpp [new file with mode: 0644]
Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp [new file with mode: 0644]
Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h [new file with mode: 0644]
Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h [new file with mode: 0644]
Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h [new file with mode: 0644]
Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h [new file with mode: 0644]
Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h
Source/WebKit/chromium/public/platform/WebMediaStreamSourcesRequest.h [new file with mode: 0644]
Source/WebKit/chromium/src/UserMediaClientImpl.h
Source/WebKit/chromium/src/WebMediaStreamComponent.cpp [new file with mode: 0644]
Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp
Source/WebKit/chromium/src/WebMediaStreamSourcesRequest.cpp [new file with mode: 0644]