Changeset 106581 in webkit
- Timestamp:
- Feb 2, 2012 12:53:58 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 12 edited
- 8 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r106580 r106581 1 2012-02-02 Tommy Widenflycht <tommyw@google.com> 2 3 [chromium] MediaStream API: Adding the embedding code for MediaStreamCenter 4 https://bugs.webkit.org/show_bug.cgi?id=73130 5 6 Reviewed by Darin Fisher. 7 8 Tests for the Media Stream API will be provided by the bug 56587, pending enough landed code. 9 10 * mediastream/UserMediaClient.h: 11 (UserMediaClient): 12 * mediastream/UserMediaRequest.cpp: 13 (WebCore::UserMediaRequest::didCompleteQuery): 14 * mediastream/UserMediaRequest.h: 15 (UserMediaRequest): 16 (WebCore::UserMediaRequest::audio): 17 (WebCore::UserMediaRequest::video): 18 (WebCore::UserMediaRequest::cameraPreferenceUser): 19 (WebCore::UserMediaRequest::cameraPreferenceEnvironment): 20 * platform/mediastream/MediaStreamCenter.cpp: 21 (WebCore): 22 (WebCore::MediaStreamCenter::queryMediaStreamSources): 23 * platform/mediastream/MediaStreamCenter.h: 24 (WebCore): 25 (MediaStreamSourcesQueryClient): 26 (MediaStreamCenter): 27 1 28 2012-02-02 Raymond Toy <rtoy@google.com> 2 29 -
trunk/Source/WebCore/mediastream/UserMediaClient.h
r105774 r106581 43 43 virtual void pageDestroyed() = 0; 44 44 45 virtual void requestUserMedia(PassRefPtr<UserMediaRequest>, const MediaStreamSourceVector& , const MediaStreamSourceVector&) = 0;45 virtual void requestUserMedia(PassRefPtr<UserMediaRequest>, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) = 0; 46 46 virtual void cancelUserMediaRequest(UserMediaRequest*) = 0; 47 47 -
trunk/Source/WebCore/mediastream/UserMediaRequest.cpp
r105774 r106581 72 72 } 73 73 74 void UserMediaRequest:: mediaStreamSourcesQueryCompleted(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)74 void UserMediaRequest::didCompleteQuery(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) 75 75 { 76 76 if (m_client) -
trunk/Source/WebCore/mediastream/UserMediaRequest.h
r105774 r106581 52 52 ~UserMediaRequest(); 53 53 54 bool audio() const { return m_audio; }55 bool video() const { return m_video; }56 57 bool cameraPreferenceUser() const { return m_cameraPreferenceUser; }58 bool cameraPreferenceEnvironment() const { return m_cameraPreferenceEnvironment; }59 60 54 NavigatorUserMediaSuccessCallback* successCallback() const { return m_successCallback.get(); } 61 55 NavigatorUserMediaErrorCallback* errorCallback() const { return m_errorCallback.get(); } 62 56 63 57 void start(); 64 void mediaStreamSourcesQueryCompleted(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);65 58 66 59 void succeed(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources); 67 60 void fail(); 61 62 // MediaStreamSourcesQueryClient 63 virtual bool audio() const { return m_audio; } 64 virtual bool video() const { return m_video; } 65 virtual bool cameraPreferenceUser() const { return m_cameraPreferenceUser; } 66 virtual bool cameraPreferenceEnvironment() const { return m_cameraPreferenceEnvironment; } 67 virtual void didCompleteQuery(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources); 68 68 69 69 // ContextDestructionObserver -
trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
r105774 r106581 56 56 } 57 57 58 // FIXME: remove when real implementations are available 59 // Empty implementations for ports that build with MEDIA_STREAM enabled by default. 58 #if !PLATFORM(CHROMIUM) 59 60 // Empty implementations for ports that build with MEDIA_STREAM enabled by default, but haven't yet implemented MediaStreamCenter. 60 61 61 62 MediaStreamCenter::MediaStreamCenter() … … 70 71 { 71 72 MediaStreamSourceVector audioSources, videoSources; 72 client-> mediaStreamSourcesQueryCompleted(audioSources, videoSources);73 client->didCompleteQuery(audioSources, videoSources); 73 74 } 74 75 … … 85 86 } 86 87 88 #endif // !PLATFORM(CHROMIUM) 89 87 90 } // namespace WebCore 88 91 -
trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h
r105774 r106581 39 39 namespace WebCore { 40 40 41 #if PLATFORM(CHROMIUM) 42 class MediaStreamCenterInternal; 43 #endif 44 41 45 class MediaStreamComponent; 42 46 class MediaStreamDescriptor; … … 48 52 virtual bool audio() const = 0; 49 53 virtual bool video() const = 0; 54 virtual bool cameraPreferenceUser() const = 0; 55 virtual bool cameraPreferenceEnvironment() const = 0; 50 56 51 virtual void mediaStreamSourcesQueryCompleted(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) = 0;57 virtual void didCompleteQuery(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) = 0; 52 58 }; 53 59 … … 74 80 private: 75 81 MediaStreamCenter(); 82 83 #if PLATFORM(CHROMIUM) 84 OwnPtr<MediaStreamCenterInternal> m_private; 85 #endif 76 86 }; 77 87 -
trunk/Source/WebKit/chromium/ChangeLog
r106573 r106581 1 2012-02-02 Tommy Widenflycht <tommyw@google.com> 2 3 [chromium] MediaStream API: Adding the embedding code for MediaStreamCenter 4 https://bugs.webkit.org/show_bug.cgi?id=73130 5 6 Reviewed by Darin Fisher. 7 8 * WebKit.gyp: 9 * bridge/MediaStreamCenter.cpp: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 10 (WebCore): 11 (WebCore::MediaStreamCenter::MediaStreamCenter): 12 (WebCore::MediaStreamCenter::~MediaStreamCenter): 13 (WebCore::MediaStreamCenter::queryMediaStreamSources): 14 (WebCore::MediaStreamCenter::didSetMediaStreamTrackEnabled): 15 (WebCore::MediaStreamCenter::didStopLocalMediaStream): 16 (WebCore::MediaStreamCenter::didConstructMediaStream): 17 * bridge/MediaStreamCenterInternal.cpp: Added. 18 (WebCore): 19 (WebCore::MediaStreamCenterInternal::MediaStreamCenterInternal): 20 (WebCore::MediaStreamCenterInternal::~MediaStreamCenterInternal): 21 (WebCore::MediaStreamCenterInternal::queryMediaStreamSources): 22 (WebCore::MediaStreamCenterInternal::didSetMediaStreamTrackEnabled): 23 (WebCore::MediaStreamCenterInternal::didStopLocalMediaStream): 24 (WebCore::MediaStreamCenterInternal::didConstructMediaStream): 25 (WebCore::MediaStreamCenterInternal::stopLocalMediaStream): 26 * bridge/MediaStreamCenterInternal.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 27 (WebKit): 28 (WebCore): 29 (MediaStreamCenterInternal): 30 * public/platform/WebKitPlatformSupport.h: 31 (WebKit): 32 (WebKit::WebKitPlatformSupport::createMediaStreamCenter): 33 * public/platform/WebMediaStreamCenter.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 34 (WebKit): 35 (WebMediaStreamCenter): 36 (WebKit::WebMediaStreamCenter::~WebMediaStreamCenter): 37 * public/platform/WebMediaStreamCenterClient.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 38 (WebKit): 39 (WebMediaStreamCenterClient): 40 (WebKit::WebMediaStreamCenterClient::~WebMediaStreamCenterClient): 41 * public/platform/WebMediaStreamComponent.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 42 (WebCore): 43 (WebKit): 44 (WebMediaStreamComponent): 45 (WebKit::WebMediaStreamComponent::WebMediaStreamComponent): 46 (WebKit::WebMediaStreamComponent::~WebMediaStreamComponent): 47 (WebKit::WebMediaStreamComponent::isNull): 48 * public/platform/WebMediaStreamDescriptor.h: 49 (WebKit): 50 (WebMediaStreamDescriptor): 51 * public/platform/WebMediaStreamSourcesRequest.h: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 52 (WebCore): 53 (WebKit): 54 (WebMediaStreamSourcesRequest): 55 (WebKit::WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest): 56 (WebKit::WebMediaStreamSourcesRequest::~WebMediaStreamSourcesRequest): 57 (WebKit::WebMediaStreamSourcesRequest::isNull): 58 * src/UserMediaClientImpl.h: 59 (UserMediaClientImpl): 60 * src/WebMediaStreamComponent.cpp: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 61 (WebKit): 62 (WebKit::WebMediaStreamComponent::WebMediaStreamComponent): 63 (WebKit::WebMediaStreamComponent::operator=): 64 (WebKit::WebMediaStreamComponent::reset): 65 (WebKit::WebMediaStreamComponent::operator PassRefPtr<MediaStreamComponent>): 66 (WebKit::WebMediaStreamComponent::operator MediaStreamComponent*): 67 (WebKit::WebMediaStreamComponent::isEnabled): 68 (WebKit::WebMediaStreamComponent::source): 69 * src/WebMediaStreamDescriptor.cpp: 70 (WebKit::WebMediaStreamDescriptor::WebMediaStreamDescriptor): 71 (WebKit): 72 (WebKit::WebMediaStreamDescriptor::audioSources): 73 (WebKit::WebMediaStreamDescriptor::videoSources): 74 * src/WebMediaStreamSourcesRequest.cpp: Copied from Source/WebKit/chromium/src/UserMediaClientImpl.h. 75 (WebKit): 76 (WebKit::WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest): 77 (WebKit::WebMediaStreamSourcesRequest::reset): 78 (WebKit::WebMediaStreamSourcesRequest::audio): 79 (WebKit::WebMediaStreamSourcesRequest::video): 80 (WebKit::WebMediaStreamSourcesRequest::didCompleteQuery): 81 1 82 2012-02-02 Sheriff Bot <webkit.review.bot@gmail.com> 2 83 -
trunk/Source/WebKit/chromium/WebKit.gyp
r106399 r106581 92 92 ], 93 93 'sources': [ 94 'bridge/MediaStreamCenter.cpp', 95 'bridge/MediaStreamCenterInternal.cpp', 96 'bridge/MediaStreamCenterInternal.h', 94 97 'bridge/PeerConnectionHandler.cpp', 95 98 'bridge/PeerConnectionHandlerInternal.cpp', … … 313 316 'public/platform/WebLayerTreeViewClient.h', 314 317 'public/platform/WebLocalizedString.h', 318 'public/platform/WebMediaStreamCenter.h', 319 'public/platform/WebMediaStreamComponent.h', 315 320 'public/platform/WebMediaStreamDescriptor.h', 316 321 'public/platform/WebMediaStreamSource.h', 322 'public/platform/WebMediaStreamSourcesRequest.h', 317 323 'public/platform/WebNonCopyable.h', 318 324 'public/platform/WebPeerConnectionHandler.h', … … 598 604 'src/WebMediaPlayerClientImpl.cpp', 599 605 'src/WebMediaPlayerClientImpl.h', 606 'src/WebMediaStreamComponent.cpp', 600 607 'src/WebMediaStreamDescriptor.cpp', 601 608 'src/WebMediaStreamRegistry.cpp', 602 609 'src/WebMediaStreamSource.cpp', 610 'src/WebMediaStreamSourcesRequest.cpp', 603 611 'src/WebNamedNodeMap.cpp', 604 612 'src/WebNetworkStateNotifier.cpp', -
trunk/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h 32 #define UserMediaClientImpl_h 31 #include "config.h" 33 32 34 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 36 #include <wtf/PassRefPtr.h> 33 #if ENABLE(MEDIA_STREAM) 34 35 #include "MediaStreamCenter.h" 36 37 #include "MediaStreamCenterInternal.h" 38 #include "MediaStreamDescriptor.h" 39 #include <wtf/PassOwnPtr.h> 37 40 38 41 namespace WebCore { 39 class UserMediaRequest; 42 43 MediaStreamCenter::MediaStreamCenter() 44 : m_private(adoptPtr(new MediaStreamCenterInternal(this))) 45 { 40 46 } 41 47 42 namespace WebKit { 48 MediaStreamCenter::~MediaStreamCenter() 49 { 50 } 43 51 44 class WebUserMediaClient; 45 class WebViewImpl; 52 void MediaStreamCenter::queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient> client) 53 { 54 m_private->queryMediaStreamSources(client); 55 } 46 56 47 class UserMediaClientImpl : public WebCore::UserMediaClient { 48 public: 49 UserMediaClientImpl(WebViewImpl*); 57 void MediaStreamCenter::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream, MediaStreamComponent* component) 58 { 59 m_private->didSetMediaStreamTrackEnabled(stream, component); 60 } 50 61 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&);54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 62 void MediaStreamCenter::didStopLocalMediaStream(MediaStreamDescriptor* stream) 63 { 64 m_private->didStopLocalMediaStream(stream); 65 } 55 66 56 private: 57 UserMediaClientImpl(); 67 void MediaStreamCenter::didConstructMediaStream(MediaStreamDescriptor* stream) 68 { 69 m_private->didConstructMediaStream(stream); 70 } 58 71 59 WebUserMediaClient* m_client; 60 }; 72 } // namespace WebCore 61 73 62 } // namespace WebKit 63 64 #endif // UserMediaClientImpl_h 74 #endif // ENABLE(MEDIA_STREAM) -
trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h32 #define UserMediaClientImpl_h31 #ifndef MediaStreamCenterInternal_h 32 #define MediaStreamCenterInternal_h 33 33 34 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 34 #if ENABLE(MEDIA_STREAM) 35 36 #include "platform/WebMediaStreamCenterClient.h" 37 #include <wtf/OwnPtr.h> 36 38 #include <wtf/PassRefPtr.h> 37 39 38 namespace Web Core{39 class UserMediaRequest;40 namespace WebKit { 41 class WebMediaStreamCenter; 40 42 } 41 43 42 namespace Web Kit{44 namespace WebCore { 43 45 44 class WebUserMediaClient; 45 class WebViewImpl; 46 class MediaStreamCenter; 47 class MediaStreamComponent; 48 class MediaStreamDescriptor; 49 class MediaStreamSourcesQueryClient; 46 50 47 class UserMediaClientImpl : public WebCore::UserMediaClient {51 class MediaStreamCenterInternal : public WebKit::WebMediaStreamCenterClient { 48 52 public: 49 UserMediaClientImpl(WebViewImpl*); 53 explicit MediaStreamCenterInternal(MediaStreamCenter*); 54 ~MediaStreamCenterInternal(); 50 55 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&); 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 56 void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>); 57 void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*); 58 void didStopLocalMediaStream(MediaStreamDescriptor*); 59 void didConstructMediaStream(MediaStreamDescriptor*); 60 61 // From WebKit::WebMediaStreamCenterClient. 62 virtual void stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor&); 55 63 56 64 private: 57 UserMediaClientImpl(); 58 59 WebUserMediaClient* m_client; 65 OwnPtr<WebKit::WebMediaStreamCenter> m_private; 66 MediaStreamCenter* m_owner; 60 67 }; 61 68 62 } // namespace Web Kit69 } // namespace WebCore 63 70 64 #endif // UserMediaClientImpl_h 71 #endif // ENABLE(MEDIA_STREAM) 72 73 #endif // MediaStreamCenterInternal_h -
trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
r106487 r106581 62 62 class WebIDBFactory; // FIXME: Does this belong in platform? 63 63 class WebIDBKey; // FIXME: Does this belong in platform? 64 class WebMediaStreamCenter; 65 class WebMediaStreamCenterClient; 64 66 class WebMessagePortChannel; // FIXME: Does this belong in platform? 65 67 class WebMimeRegistry; … … 338 340 // May return null if WebRTC functionality is not avaliable or out of resources. 339 341 virtual WebPeerConnectionHandler* createPeerConnectionHandler(WebPeerConnectionHandlerClient*) { return 0; } 342 virtual WebMediaStreamCenter* createMediaStreamCenter(WebMediaStreamCenterClient*) { return 0; } 340 343 341 344 virtual void didStartWorkerRunLoop(const WebWorkerRunLoop&) { } -
trunk/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h 32 #define UserMediaClientImpl_h 33 34 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 36 #include <wtf/PassRefPtr.h> 37 38 namespace WebCore { 39 class UserMediaRequest; 40 } 31 #ifndef WebMediaStreamCenter_h 32 #define WebMediaStreamCenter_h 41 33 42 34 namespace WebKit { 43 35 44 class WebUserMediaClient; 45 class WebViewImpl; 36 class WebMediaStreamComponent; 37 class WebMediaStreamDescriptor; 38 class WebMediaStreamSourcesRequest; 46 39 47 class UserMediaClientImpl : public WebCore::UserMediaClient{40 class WebMediaStreamCenter { 48 41 public: 49 UserMediaClientImpl(WebViewImpl*);42 virtual ~WebMediaStreamCenter() { } 50 43 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&); 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 55 56 private: 57 UserMediaClientImpl(); 58 59 WebUserMediaClient* m_client; 44 virtual void queryMediaStreamSources(const WebMediaStreamSourcesRequest&) = 0; 45 virtual void didEnableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0; 46 virtual void didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0; 47 virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0; 48 virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) = 0; 60 49 }; 61 50 62 51 } // namespace WebKit 63 52 64 #endif // UserMediaClientImpl_h 53 #endif // WebMediaStreamCenter_h 54 -
trunk/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h 32 #define UserMediaClientImpl_h 33 34 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 36 #include <wtf/PassRefPtr.h> 37 38 namespace WebCore { 39 class UserMediaRequest; 40 } 31 #ifndef WebMediaStreamCenterClient_h 32 #define WebMediaStreamCenterClient_h 41 33 42 34 namespace WebKit { 43 35 44 class WebUserMediaClient; 45 class WebViewImpl; 36 class WebMediaStreamDescriptor; 46 37 47 class UserMediaClientImpl : public WebCore::UserMediaClient {38 class WebMediaStreamCenterClient { 48 39 public: 49 UserMediaClientImpl(WebViewImpl*);40 virtual ~WebMediaStreamCenterClient() { } 50 41 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&); 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 55 56 private: 57 UserMediaClientImpl(); 58 59 WebUserMediaClient* m_client; 42 virtual void stopLocalMediaStream(const WebMediaStreamDescriptor&) = 0; 60 43 }; 61 44 62 45 } // namespace WebKit 63 46 64 #endif // UserMediaClientImpl_h47 #endif // WebMediaStreamCenterClient_h -
trunk/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h32 #define UserMediaClientImpl_h31 #ifndef WebMediaStreamComponent_h 32 #define WebMediaStreamComponent_h 33 33 34 #include " MediaStreamSource.h"35 #include " UserMediaClient.h"36 #include <wtf/PassRefPtr.h>34 #include "WebCommon.h" 35 #include "WebNonCopyable.h" 36 #include "WebPrivatePtr.h" 37 37 38 38 namespace WebCore { 39 class UserMediaRequest;39 class MediaStreamComponent; 40 40 } 41 41 42 42 namespace WebKit { 43 43 44 class Web UserMediaClient;45 class Web ViewImpl;44 class WebMediaStreamSource; 45 class WebString; 46 46 47 class UserMediaClientImpl : public WebCore::UserMediaClient {47 class WebMediaStreamComponent { 48 48 public: 49 UserMediaClientImpl(WebViewImpl*); 49 WebMediaStreamComponent() { } 50 ~WebMediaStreamComponent() { reset(); } 50 51 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&); 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 52 WEBKIT_EXPORT void reset(); 53 bool isNull() const { return m_private.isNull(); } 54 55 WEBKIT_EXPORT WebMediaStreamSource source() const; 56 WEBKIT_EXPORT bool isEnabled() const; 57 58 #if WEBKIT_IMPLEMENTATION 59 WebMediaStreamComponent(WebCore::MediaStreamComponent*); 60 WebMediaStreamComponent& operator=(WebCore::MediaStreamComponent*); 61 operator WTF::PassRefPtr<WebCore::MediaStreamComponent>() const; 62 operator WebCore::MediaStreamComponent*() const; 63 #endif 55 64 56 65 private: 57 UserMediaClientImpl(); 58 59 WebUserMediaClient* m_client; 66 WebPrivatePtr<WebCore::MediaStreamComponent> m_private; 60 67 }; 61 68 62 69 } // namespace WebKit 63 70 64 #endif // UserMediaClientImpl_h71 #endif // WebMediaStreamComponent_h -
trunk/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h
r106256 r106581 37 37 namespace WebKit { 38 38 39 class WebMediaStreamComponent; 39 40 class WebMediaStreamSource; 40 41 class WebString; … … 66 67 WEBKIT_EXPORT void sources(WebVector<WebMediaStreamSource>&) const; 67 68 68 WEBKIT_EXPORT void audioSources(WebVector<WebMediaStream Source>&) const;69 WEBKIT_EXPORT void videoSources(WebVector<WebMediaStream Source>&) const;69 WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamComponent>&) const; 70 WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamComponent>&) const; 70 71 71 72 #if WEBKIT_IMPLEMENTATION 73 WebMediaStreamDescriptor(WebCore::MediaStreamDescriptor*); 72 74 WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&); 73 75 operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const; -
trunk/Source/WebKit/chromium/public/platform/WebMediaStreamSourcesRequest.h
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h32 #define UserMediaClientImpl_h31 #ifndef WebMediaStreamSourcesRequest_h 32 #define WebMediaStreamSourcesRequest_h 33 33 34 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 36 #include <wtf/PassRefPtr.h> 34 #include "WebCommon.h" 35 #include "WebPrivatePtr.h" 37 36 38 37 namespace WebCore { 39 class UserMediaRequest;38 class MediaStreamSourcesQueryClient; 40 39 } 41 40 42 41 namespace WebKit { 43 42 44 class Web UserMediaClient;45 class WebViewImpl;43 class WebMediaStreamSource; 44 template <typename T> class WebVector; 46 45 47 class UserMediaClientImpl : public WebCore::UserMediaClient {46 class WebMediaStreamSourcesRequest { 48 47 public: 49 UserMediaClientImpl(WebViewImpl*); 48 WebMediaStreamSourcesRequest() { } 49 ~WebMediaStreamSourcesRequest() { reset(); } 50 50 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&); 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 51 WEBKIT_EXPORT void reset(); 52 bool isNull() const { return m_private.isNull(); } 53 54 WEBKIT_EXPORT bool audio() const; 55 WEBKIT_EXPORT bool video() const; 56 57 WEBKIT_EXPORT void didCompleteQuery(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources) const; 58 59 #if WEBKIT_IMPLEMENTATION 60 WebMediaStreamSourcesRequest(const WTF::PassRefPtr<WebCore::MediaStreamSourcesQueryClient>&); 61 #endif 55 62 56 63 private: 57 UserMediaClientImpl(); 58 59 WebUserMediaClient* m_client; 64 WebPrivatePtr<WebCore::MediaStreamSourcesQueryClient> m_private; 60 65 }; 61 66 62 67 } // namespace WebKit 63 68 64 #endif // UserMediaClientImpl_h69 #endif // WebMediaStreamSourcesRequest_h -
trunk/Source/WebKit/chromium/src/UserMediaClientImpl.h
r105774 r106581 51 51 // WebCore::UserMediaClient ---------------------------------------------- 52 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector& , const WebCore::MediaStreamSourceVector&);53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector& audioSources, const WebCore::MediaStreamSourceVector& videoSources); 54 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 55 55 -
trunk/Source/WebKit/chromium/src/WebMediaStreamComponent.cpp
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h 32 #define UserMediaClientImpl_h 31 #include "config.h" 33 32 34 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 36 #include <wtf/PassRefPtr.h> 33 #if ENABLE(MEDIA_STREAM) 37 34 38 namespace WebCore { 39 class UserMediaRequest; 40 } 35 #include "platform/WebMediaStreamComponent.h" 36 37 #include "MediaStreamComponent.h" 38 #include "platform/WebMediaStreamSource.h" 39 #include "platform/WebString.h" 40 #include <wtf/Vector.h> 41 42 using namespace WebCore; 41 43 42 44 namespace WebKit { 43 45 44 class WebUserMediaClient; 45 class WebViewImpl; 46 WebMediaStreamComponent::WebMediaStreamComponent(WebCore::MediaStreamComponent* mediaStreamComponent) 47 : m_private(mediaStreamComponent) 48 { 49 } 46 50 47 class UserMediaClientImpl : public WebCore::UserMediaClient { 48 public: 49 UserMediaClientImpl(WebViewImpl*); 51 WebMediaStreamComponent& WebMediaStreamComponent::operator=(WebCore::MediaStreamComponent* mediaStreamComponent) 52 { 53 m_private = mediaStreamComponent; 54 return *this; 55 } 50 56 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&);54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 57 void WebMediaStreamComponent::reset() 58 { 59 m_private.reset(); 60 } 55 61 56 private: 57 UserMediaClientImpl(); 62 WebMediaStreamComponent::operator PassRefPtr<MediaStreamComponent>() const 63 { 64 return m_private.get(); 65 } 58 66 59 WebUserMediaClient* m_client; 60 }; 67 WebMediaStreamComponent::operator MediaStreamComponent*() const 68 { 69 return m_private.get(); 70 } 71 72 bool WebMediaStreamComponent::isEnabled() const 73 { 74 ASSERT(!m_private.isNull()); 75 return m_private.get()->enabled(); 76 } 77 78 WebMediaStreamSource WebMediaStreamComponent::source() const 79 { 80 ASSERT(!m_private.isNull()); 81 return WebMediaStreamSource(m_private.get()->source()); 82 } 61 83 62 84 } // namespace WebKit 63 85 64 #endif // UserMediaClientImpl_h 86 #endif // ENABLE(MEDIA_STREAM) 87 -
trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp
r106256 r106581 38 38 #include "MediaStreamDescriptor.h" 39 39 #include "MediaStreamSource.h" 40 #include "platform/WebMediaStreamComponent.h" 40 41 #include "platform/WebMediaStreamSource.h" 41 42 #include "platform/WebString.h" … … 47 48 48 49 WebMediaStreamDescriptor::WebMediaStreamDescriptor(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor) 50 : m_private(mediaStreamDescriptor) 51 { 52 } 53 54 WebMediaStreamDescriptor::WebMediaStreamDescriptor(WebCore::MediaStreamDescriptor* mediaStreamDescriptor) 49 55 : m_private(mediaStreamDescriptor) 50 56 { … … 75 81 } 76 82 77 void WebMediaStreamDescriptor::audioSources(WebVector<WebMediaStream Source>& webSources) const83 void WebMediaStreamDescriptor::audioSources(WebVector<WebMediaStreamComponent>& webSources) const 78 84 { 79 85 size_t numberOfSources = m_private->numberOfAudioComponents(); 80 WebVector<WebMediaStream Source> result(numberOfSources);86 WebVector<WebMediaStreamComponent> result(numberOfSources); 81 87 for (size_t i = 0; i < numberOfSources; ++i) 82 result[i] = m_private->audioComponent(i) ->source();88 result[i] = m_private->audioComponent(i); 83 89 webSources.swap(result); 84 90 } 85 91 86 void WebMediaStreamDescriptor::videoSources(WebVector<WebMediaStream Source>& webSources) const92 void WebMediaStreamDescriptor::videoSources(WebVector<WebMediaStreamComponent>& webSources) const 87 93 { 88 94 size_t numberOfSources = m_private->numberOfVideoComponents(); 89 WebVector<WebMediaStream Source> result(numberOfSources);95 WebVector<WebMediaStreamComponent> result(numberOfSources); 90 96 for (size_t i = 0; i < numberOfSources; ++i) 91 result[i] = m_private->videoComponent(i) ->source();97 result[i] = m_private->videoComponent(i); 92 98 webSources.swap(result); 93 99 } -
trunk/Source/WebKit/chromium/src/WebMediaStreamSourcesRequest.cpp
r106580 r106581 1 1 /* 2 * Copyright (C) 201 1Google Inc. All rights reserved.2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 */ 30 30 31 #ifndef UserMediaClientImpl_h 32 #define UserMediaClientImpl_h 31 #include "config.h" 33 32 33 #if ENABLE(MEDIA_STREAM) 34 35 #include "platform/WebMediaStreamSourcesRequest.h" 36 37 #include "MediaStreamCenter.h" 34 38 #include "MediaStreamSource.h" 35 #include "UserMediaClient.h" 36 #include <wtf/PassRefPtr.h> 39 #include "platform/WebMediaStreamSource.h" 40 #include "platform/WebVector.h" 41 #include <wtf/Vector.h> 37 42 38 namespace WebCore { 39 class UserMediaRequest; 40 } 43 using namespace WebCore; 41 44 42 45 namespace WebKit { 43 46 44 class WebUserMediaClient; 45 class WebViewImpl; 47 WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest(const PassRefPtr<WebCore::MediaStreamSourcesQueryClient>& queryClient) 48 : m_private(queryClient) 49 { 50 } 46 51 47 class UserMediaClientImpl : public WebCore::UserMediaClient { 48 public: 49 UserMediaClientImpl(WebViewImpl*); 52 void WebMediaStreamSourcesRequest::reset() 53 { 54 m_private.reset(); 55 } 50 56 51 // WebCore::UserMediaClient ---------------------------------------------- 52 virtual void pageDestroyed(); 53 virtual void requestUserMedia(PassRefPtr<WebCore::UserMediaRequest>, const WebCore::MediaStreamSourceVector&, const WebCore::MediaStreamSourceVector&); 54 virtual void cancelUserMediaRequest(WebCore::UserMediaRequest*); 57 bool WebMediaStreamSourcesRequest::audio() const 58 { 59 ASSERT(!isNull()); 60 return m_private->audio(); 61 } 55 62 56 private: 57 UserMediaClientImpl(); 63 bool WebMediaStreamSourcesRequest::video() const 64 { 65 ASSERT(!isNull()); 66 return m_private->video(); 67 } 58 68 59 WebUserMediaClient* m_client; 60 }; 69 void WebMediaStreamSourcesRequest::didCompleteQuery(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources) const 70 { 71 ASSERT(!isNull()); 72 MediaStreamSourceVector audio; 73 for (size_t i = 0; i < audioSources.size(); ++i) { 74 MediaStreamSource* curr = audioSources[i]; 75 audio.append(curr); 76 } 77 MediaStreamSourceVector video; 78 for (size_t i = 0; i < videoSources.size(); ++i) { 79 MediaStreamSource* curr = videoSources[i]; 80 video.append(curr); 81 } 82 m_private->didCompleteQuery(audio, video); 83 } 61 84 62 85 } // namespace WebKit 63 86 64 #endif // UserMediaClientImpl_h 87 #endif // ENABLE(MEDIA_STREAM) 88
Note: See TracChangeset
for help on using the changeset viewer.