REGRESSION (r208802): TouchBar pause button doesn't work
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2016 22:00:57 +0000 (22:00 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2016 22:00:57 +0000 (22:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=165333
-and corresponding-
rdar://problem/29487187

Reviewed by Wenson Hsieh.

The previous code got this right by using self.playing. _playing was totally un-
used, so this patch just removes it.

* platform/mac/WebPlaybackControlsManager.h:
* platform/mac/WebPlaybackControlsManager.mm:
(-[WebPlaybackControlsManager setPlaying:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/mac/WebPlaybackControlsManager.h
Source/WebCore/platform/mac/WebPlaybackControlsManager.mm

index 6778ec2..46f2d81 100644 (file)
@@ -1,3 +1,19 @@
+2016-12-02  Beth Dakin  <bdakin@apple.com>
+
+        REGRESSION (r208802): TouchBar pause button doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=165333
+        -and corresponding-
+        rdar://problem/29487187
+
+        Reviewed by Wenson Hsieh.
+
+        The previous code got this right by using self.playing. _playing was totally un-
+        used, so this patch just removes it.
+
+        * platform/mac/WebPlaybackControlsManager.h:
+        * platform/mac/WebPlaybackControlsManager.mm:
+        (-[WebPlaybackControlsManager setPlaying:]):
+
 2016-12-02  John Wilander  <wilander@apple.com>
 
         Require preflight for non-standard CORS-safelisted request headers Accept, Accept-Language, and Content-Language
index 6bff429..bce04d6 100644 (file)
@@ -51,7 +51,6 @@ WEBCORE_EXPORT
     RetainPtr<NSArray<AVFunctionBarMediaSelectionOption *>> _legibleFunctionBarMediaSelectionOptions;
     RetainPtr<AVFunctionBarMediaSelectionOption> _currentLegibleFunctionBarMediaSelectionOption;
     float _rate;
-    BOOL _playing;
     BOOL _canTogglePlayback;
 
 @private
index 3a86f65..50ed74d 100644 (file)
@@ -237,7 +237,7 @@ static RetainPtr<NSMutableArray> mediaSelectionOptions(const Vector<String>& opt
     if (!_webPlaybackSessionInterfaceMac || !_webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
         return;
 
-    BOOL isCurrentlyPlaying = _playing;
+    BOOL isCurrentlyPlaying = self.playing;
     if (!isCurrentlyPlaying && playing)
         _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->play();
     else if (isCurrentlyPlaying && !playing)