Title: [215876] tags/Safari-604.1.19/Source/WebCore
- Revision
- 215876
- Author
- matthew_han...@apple.com
- Date
- 2017-04-27 10:02:13 -0700 (Thu, 27 Apr 2017)
Log Message
Cherry-pick r215870. rdar://problem/31845349
Modified Paths
Diff
Modified: tags/Safari-604.1.19/Source/WebCore/ChangeLog (215875 => 215876)
--- tags/Safari-604.1.19/Source/WebCore/ChangeLog 2017-04-27 16:55:12 UTC (rev 215875)
+++ tags/Safari-604.1.19/Source/WebCore/ChangeLog 2017-04-27 17:02:13 UTC (rev 215876)
@@ -1,3 +1,13 @@
+2017-04-27 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r215870. rdar://problem/31845349
+
+ 2017-04-27 Andy Estes <aes...@apple.com>
+
+ Fix the macOS build.
+
+ * platform/mac/WebPlaybackControlsManager.h:
+
2017-04-27 Dean Jackson <d...@apple.com>
Use the correct modern-media-controls
Modified: tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (215875 => 215876)
--- tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2017-04-27 16:55:12 UTC (rev 215875)
+++ tags/Safari-604.1.19/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2017-04-27 17:02:13 UTC (rev 215876)
@@ -65,8 +65,8 @@
@property (getter=isPlaying) BOOL playing;
@property BOOL canTogglePlayback;
@property (nonatomic) float rate;
-@property (nonatomic) BOOL allowsPictureInPicturePlayback;
-@property (nonatomic, getter=isPictureInPictureActive) BOOL pictureInPictureActive;
+@property BOOL allowsPictureInPicturePlayback;
+@property (getter=isPictureInPictureActive) BOOL pictureInPictureActive;
- (AVTouchBarMediaSelectionOption *)currentAudioTouchBarMediaSelectionOption;
- (void)setCurrentAudioTouchBarMediaSelectionOption:(AVTouchBarMediaSelectionOption *)option;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
