Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h - Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Side by Side Diff: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h

Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly" (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/platform/mediastream/RTCStatsRequest.h ('k') | Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 30 matching lines...) Expand all Loading...
41 namespace WebKit {	41 namespace WebKit {

42 class WebMediaStream;	42 class WebMediaStream;

43 class WebMediaStreamCenter;	43 class WebMediaStreamCenter;

44 class WebMediaStreamTrack;	44 class WebMediaStreamTrack;

45 class WebSourceInfo;	45 class WebSourceInfo;

46 }	46 }

47	47

48 namespace WebCore {	48 namespace WebCore {

49	49

50 class MediaStreamComponent;	50 class MediaStreamComponent;

	51 class MediaStreamDescriptor;

51 class MediaStreamSourcesQueryClient;	52 class MediaStreamSourcesQueryClient;

52	53

53 class MediaStreamCenterChromium : public MediaStreamCenter, public WebKit::WebMe diaStreamCenterClient {	54 class MediaStreamCenterChromium : public MediaStreamCenter, public WebKit::WebMe diaStreamCenterClient {

54 public:	55 public:

55 MediaStreamCenterChromium();	56 MediaStreamCenterChromium();

56 ~MediaStreamCenterChromium();	57 ~MediaStreamCenterChromium();

57	58

58 // MediaStreamCenter	59 // MediaStreamCenter

59 virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClien t>) OVERRIDE;	60 virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClien t>) OVERRIDE;

60 virtual bool getSourceInfos(const String& url, WebKit::WebVector<WebKit::Web SourceInfo>&) OVERRIDE;	61 virtual bool getSourceInfos(const String& url, WebKit::WebVector<WebKit::Web SourceInfo>&) OVERRIDE;

61 virtual void didSetMediaStreamTrackEnabled(WebKit::WebMediaStream, MediaStre amComponent*) OVERRIDE;	62 virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor, MediaStre amComponent) OVERRIDE;

62 virtual bool didAddMediaStreamTrack(WebKit::WebMediaStream, MediaStreamCompo nent*) OVERRIDE;	63 virtual bool didAddMediaStreamTrack(MediaStreamDescriptor, MediaStreamCompo nent) OVERRIDE;

63 virtual bool didRemoveMediaStreamTrack(WebKit::WebMediaStream, MediaStreamCo mponent*) OVERRIDE;	64 virtual bool didRemoveMediaStreamTrack(MediaStreamDescriptor, MediaStreamCo mponent) OVERRIDE;

64 virtual void didStopLocalMediaStream(WebKit::WebMediaStream) OVERRIDE;	65 virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;

65 virtual void didCreateMediaStream(WebKit::WebMediaStream) OVERRIDE;	66 virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;

66	67

67 // WebKit::WebMediaStreamCenterClient	68 // WebKit::WebMediaStreamCenterClient

68 virtual void stopLocalMediaStream(WebKit::WebMediaStream) OVERRIDE;	69 virtual void stopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;

69	70

70 private:	71 private:

71 OwnPtr<WebKit::WebMediaStreamCenter> m_private;	72 OwnPtr<WebKit::WebMediaStreamCenter> m_private;

72 };	73 };

73	74

74 } // namespace WebCore	75 } // namespace WebCore

75	76

76 #endif // MediaStreamCenterChromium_h	77 #endif // MediaStreamCenterChromium_h

OLD	NEW