Title: [186565] trunk/Source/WebCore
- Revision
- 186565
- Author
- commit-qu...@webkit.org
- Date
- 2015-07-08 19:27:32 -0700 (Wed, 08 Jul 2015)
Log Message
Make MediaStream conform to its private client like MediaSource does
https://bugs.webkit.org/show_bug.cgi?id=146756
<rdar://problem/21736457>
Patch by Matthew Daiter <mdai...@apple.com> on 2015-07-08
Reviewed by Brent Fulgham.
MediaStream should be inheriting its PrivateClient's getters and
setters for RefCounted, not inheriting its own.
* Modules/mediastream/MediaStream.h: Changed MediaStream's inherit
statements
* platform/mediastream/MediaStreamPrivate.h: Changed
MediaStreamPrivateClient to inherit RefCounted<MediaStreamPrivateClient>
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186564 => 186565)
--- trunk/Source/WebCore/ChangeLog 2015-07-09 02:23:25 UTC (rev 186564)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 02:27:32 UTC (rev 186565)
@@ -1,5 +1,21 @@
2015-07-08 Matthew Daiter <mdai...@apple.com>
+ Make MediaStream conform to its private client like MediaSource does
+ https://bugs.webkit.org/show_bug.cgi?id=146756
+ <rdar://problem/21736457>
+
+ Reviewed by Brent Fulgham.
+
+ MediaStream should be inheriting its PrivateClient's getters and
+ setters for RefCounted, not inheriting its own.
+
+ * Modules/mediastream/MediaStream.h: Changed MediaStream's inherit
+ statements
+ * platform/mediastream/MediaStreamPrivate.h: Changed
+ MediaStreamPrivateClient to inherit RefCounted<MediaStreamPrivateClient>
+
+2015-07-08 Matthew Daiter <mdai...@apple.com>
+
Made AVMediaCaptureSource's session accessor public
https://bugs.webkit.org/show_bug.cgi?id=146758
<rdar://problem/21736651>
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (186564 => 186565)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-07-09 02:23:25 UTC (rev 186564)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-07-09 02:27:32 UTC (rev 186565)
@@ -44,7 +44,7 @@
namespace WebCore {
-class MediaStream final : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamPrivateClient, public EventTargetWithInlineData, public ContextDestructionObserver, public MediaStreamTrack::Observer {
+class MediaStream final : public URLRegistrable, public ScriptWrappable, public MediaStreamPrivateClient, public EventTargetWithInlineData, public ContextDestructionObserver, public MediaStreamTrack::Observer {
public:
class Observer {
public:
@@ -78,8 +78,8 @@
virtual EventTargetInterface eventTargetInterface() const final { return MediaStreamEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); }
- using RefCounted<MediaStream>::ref;
- using RefCounted<MediaStream>::deref;
+ using RefCounted<MediaStreamPrivateClient>::ref;
+ using RefCounted<MediaStreamPrivateClient>::deref;
// URLRegistrable
virtual URLRegistry& registry() const override;
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (186564 => 186565)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-07-09 02:23:25 UTC (rev 186564)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-07-09 02:27:32 UTC (rev 186565)
@@ -45,7 +45,7 @@
class MediaStreamTrackPrivate;
-class MediaStreamPrivateClient {
+class MediaStreamPrivateClient : public RefCounted<MediaStreamPrivateClient> {
public:
virtual ~MediaStreamPrivateClient() { }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
