Attachment 256430 Details for Bug 146756 – Patch

[patch] Patch

bug-146756-20150708170838.patch (text/plain), 2.95 KB, created by Matthew Daiter on 2015-07-08 17:09:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Daiter

Created: 2015-07-08 17:09:38 PDT

Size: 2.95 KB

patch

obsolete

>Subversion Revision: 186540
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a5ff4d9c5e9cf5826bc8166ebcf7755040996329..b1e175b93af513dd440ba1c47743b1958c802f18 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2015-07-08  Matthew Daiter  <mdaiter@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 NOBODY (OOPS!).
>+
>+        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  Brady Eidson  <beidson@apple.com>
> 
>         Move PingLoaders to the NetworkingProcess.
>diff --git a/Source/WebCore/Modules/mediastream/MediaStream.h b/Source/WebCore/Modules/mediastream/MediaStream.h
>index e4169417f576f293dee6d62a460988a325da1876..0eed42bd35d37cf3f3e3963fb2e30fb1747d7910 100644
>--- a/Source/WebCore/Modules/mediastream/MediaStream.h
>+++ b/Source/WebCore/Modules/mediastream/MediaStream.h
>@@ -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 @@ public:
>     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;
>diff --git a/Source/WebCore/platform/mediastream/MediaStreamPrivate.h b/Source/WebCore/platform/mediastream/MediaStreamPrivate.h
>index da67f891b3b887f207191ad029bedf85b8447b14..3e63f4ca42507053d83adea5dd0dfb57ba236921 100644
>--- a/Source/WebCore/platform/mediastream/MediaStreamPrivate.h
>+++ b/Source/WebCore/platform/mediastream/MediaStreamPrivate.h
>@@ -45,7 +45,7 @@ namespace WebCore {
> 
> class MediaStreamTrackPrivate;
> 
>-class MediaStreamPrivateClient {
>+class MediaStreamPrivateClient : public RefCounted<MediaStreamPrivateClient> {
> public:
>     virtual ~MediaStreamPrivateClient() { }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 146756: 256430