Changeset 202908 in webkit

Timestamp:

Jul 7, 2016, 9:00:20 AM (10 years ago)

Author:

jer.noble@apple.com

Message:

Ownership between WebPlaybackSessionInterfaceMac and WebPlaybackControlsManager is backwards.
​https://bugs.webkit.org/show_bug.cgi?id=159441

Reviewed by Eric Carlson.

The WebPlaybackControlsManager should own the WebPlaybackSessionInterfaceMac, and not
vice versa.

• platform/mac/WebPlaybackControlsManager.h:
• platform/mac/WebPlaybackControlsManager.mm:

(-[WebPlaybackControlsManager webPlaybackSessionInterfaceMac]):
(-[WebPlaybackControlsManager setWebPlaybackSessionInterfaceMac:]):

• platform/mac/WebPlaybackSessionInterfaceMac.h:
• platform/mac/WebPlaybackSessionInterfaceMac.mm:

(WebCore::WebPlaybackSessionInterfaceMac::playBackControlsManager):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/WebPlaybackControlsManager.h (modified) (1 diff)
• platform/mac/WebPlaybackControlsManager.mm (modified) (2 diffs)
• platform/mac/WebPlaybackSessionInterfaceMac.h (modified) (1 diff)
• platform/mac/WebPlaybackSessionInterfaceMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-05  Jer Noble  <jer.noble@apple.com>
+
+        Ownership between WebPlaybackSessionInterfaceMac and WebPlaybackControlsManager is backwards.
+        https://bugs.webkit.org/show_bug.cgi?id=159441
+
+        Reviewed by Eric Carlson.
+
+        The WebPlaybackControlsManager should own the WebPlaybackSessionInterfaceMac, and not
+        vice versa.
+
+        * platform/mac/WebPlaybackControlsManager.h:
+        * platform/mac/WebPlaybackControlsManager.mm:
+        (-[WebPlaybackControlsManager webPlaybackSessionInterfaceMac]):
+        (-[WebPlaybackControlsManager setWebPlaybackSessionInterfaceMac:]):
+        * platform/mac/WebPlaybackSessionInterfaceMac.h:
+        * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+        (WebCore::WebPlaybackSessionInterfaceMac::playBackControlsManager):
+
 2016-07-07  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h

@@ -54 +54 @@
 
 @private
-    WebCore::WebPlaybackSessionInterfaceMac* _webPlaybackSessionInterfaceMac;
+    RefPtr<WebCore::WebPlaybackSessionInterfaceMac> _webPlaybackSessionInterfaceMac;
 }
 
-@property (assign) WebCore::WebPlaybackSessionInterfaceMac* webPlaybackSessionInterfaceMac;
+@property (retain) WebCore::WebPlaybackSessionInterfaceMac* webPlaybackSessionInterfaceMac;
 @property (readwrite) NSTimeInterval contentDuration;
 @property (nonatomic, retain, readwrite) AVValueTiming *timing;

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm

@@ -34 +34 @@
 @implementation WebPlaybackControlsManager
 
-@synthesize webPlaybackSessionInterfaceMac=_webPlaybackSessionInterfaceMac;
+using namespace WebCore;
+
 @synthesize contentDuration=_contentDuration;
 @synthesize hasEnabledAudio=_hasEnabledAudio;
@@ -41 +42 @@
 @synthesize playing=_playing;
 @synthesize canTogglePlayback=_canTogglePlayback;
+
+@synthesize webPlaybackSessionInterfaceMac=_webPlaybackSessionInterfaceMac;
+
+- (WebPlaybackSessionInterfaceMac*)webPlaybackSessionInterfaceMac
+{
+    return _webPlaybackSessionInterfaceMac.get();
+}
+
+- (void)setWebPlaybackSessionInterfaceMac:(WebPlaybackSessionInterfaceMac*)webPlaybackSessionInterfaceMac
+{
+    _webPlaybackSessionInterfaceMac = webPlaybackSessionInterfaceMac;
+}
 
 - (AVValueTiming *)timing

trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.h

@@ -80 +80 @@
 private:
     WebPlaybackSessionModel* m_playbackSessionModel { nullptr };
-    RetainPtr<WebPlaybackControlsManager> m_playbackControlsManager;
+    WebPlaybackControlsManager *m_playbackControlsManager;
     WebPlaybackSessionInterfaceMacClient* m_client { nullptr };
 };

trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm

@@ -138 +138 @@
 {
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
-    return m_playbackControlsManager.get();
+    return m_playbackControlsManager;
 #else
     return nil;