Title: [209264] trunk/Source/WebCore
- Revision
- 209264
- Author
- [email protected]
- Date
- 2016-12-02 14:00:57 -0800 (Fri, 02 Dec 2016)
Log Message
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:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209263 => 209264)
--- trunk/Source/WebCore/ChangeLog 2016-12-02 21:46:12 UTC (rev 209263)
+++ trunk/Source/WebCore/ChangeLog 2016-12-02 22:00:57 UTC (rev 209264)
@@ -1,3 +1,19 @@
+2016-12-02 Beth Dakin <[email protected]>
+
+ 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 <[email protected]>
Require preflight for non-standard CORS-safelisted request headers Accept, Accept-Language, and Content-Language
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (209263 => 209264)
--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-12-02 21:46:12 UTC (rev 209263)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-12-02 22:00:57 UTC (rev 209264)
@@ -51,7 +51,6 @@
RetainPtr<NSArray<AVFunctionBarMediaSelectionOption *>> _legibleFunctionBarMediaSelectionOptions;
RetainPtr<AVFunctionBarMediaSelectionOption> _currentLegibleFunctionBarMediaSelectionOption;
float _rate;
- BOOL _playing;
BOOL _canTogglePlayback;
@private
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm (209263 => 209264)
--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-12-02 21:46:12 UTC (rev 209263)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-12-02 22:00:57 UTC (rev 209264)
@@ -237,7 +237,7 @@
if (!_webPlaybackSessionInterfaceMac || !_webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
return;
- BOOL isCurrentlyPlaying = _playing;
+ BOOL isCurrentlyPlaying = self.playing;
if (!isCurrentlyPlaying && playing)
_webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->play();
else if (isCurrentlyPlaying && !playing)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
