Title: [209281] tags/Safari-603.1.14/Source/WebCore
- Revision
- 209281
- Author
- [email protected]
- Date
- 2016-12-02 15:36:50 -0800 (Fri, 02 Dec 2016)
Log Message
Merge r209264. rdar://problem/29487187
Modified Paths
Diff
Modified: tags/Safari-603.1.14/Source/WebCore/ChangeLog (209280 => 209281)
--- tags/Safari-603.1.14/Source/WebCore/ChangeLog 2016-12-02 23:21:22 UTC (rev 209280)
+++ tags/Safari-603.1.14/Source/WebCore/ChangeLog 2016-12-02 23:36:50 UTC (rev 209281)
@@ -1,3 +1,23 @@
+2016-12-02 Matthew Hanson <[email protected]>
+
+ Merge r209264. rdar://problem/29487187
+
+ 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 Dave Hyatt <[email protected]>
[CSS Parser] Make sure the templatized consumeIdent uses CSSValuePool
Modified: tags/Safari-603.1.14/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (209280 => 209281)
--- tags/Safari-603.1.14/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-12-02 23:21:22 UTC (rev 209280)
+++ tags/Safari-603.1.14/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-12-02 23:36:50 UTC (rev 209281)
@@ -51,7 +51,6 @@
RetainPtr<NSArray<AVFunctionBarMediaSelectionOption *>> _legibleFunctionBarMediaSelectionOptions;
RetainPtr<AVFunctionBarMediaSelectionOption> _currentLegibleFunctionBarMediaSelectionOption;
float _rate;
- BOOL _playing;
BOOL _canTogglePlayback;
@private
Modified: tags/Safari-603.1.14/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm (209280 => 209281)
--- tags/Safari-603.1.14/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-12-02 23:21:22 UTC (rev 209280)
+++ tags/Safari-603.1.14/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-12-02 23:36:50 UTC (rev 209281)
@@ -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
