Title: [208650] trunk/Source/WebCore
- Revision
- 208650
- Author
- [email protected]
- Date
- 2016-11-12 09:33:19 -0800 (Sat, 12 Nov 2016)
Log Message
Tried to fix the build
* platform/mac/WebPlaybackControlsManager.h: Declared conformance to
AVFunctionBarPlaybackControlsControlling, which is expected in WebKit::WebViewImpl.
Added ivar.
* platform/mac/WebPlaybackControlsManager.mm:
Synthesize seekToTime property needed for AVFunctionBarPlaybackControlsControlling
conformance.
(-[WebPlaybackControlsManager isSeeking]): Implement this
AVFunctionBarPlaybackControlsControlling method.
(-[WebPlaybackControlsManager seekToTime:toleranceBefore:toleranceAfter:]): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208649 => 208650)
--- trunk/Source/WebCore/ChangeLog 2016-11-12 17:13:39 UTC (rev 208649)
+++ trunk/Source/WebCore/ChangeLog 2016-11-12 17:33:19 UTC (rev 208650)
@@ -2,6 +2,20 @@
Tried to fix the build
+ * platform/mac/WebPlaybackControlsManager.h: Declared conformance to
+ AVFunctionBarPlaybackControlsControlling, which is expected in WebKit::WebViewImpl.
+ Added ivar.
+ * platform/mac/WebPlaybackControlsManager.mm:
+ Synthesize seekToTime property needed for AVFunctionBarPlaybackControlsControlling
+ conformance.
+ (-[WebPlaybackControlsManager isSeeking]): Implement this
+ AVFunctionBarPlaybackControlsControlling method.
+ (-[WebPlaybackControlsManager seekToTime:toleranceBefore:toleranceAfter:]): Ditto.
+
+2016-11-12 Dan Bernstein <[email protected]>
+
+ Tried to fix the build
+
* platform/spi/cocoa/NSTouchBarSPI.h: Removed duplicate @interface declarations.
2016-11-12 Frederic Wang <[email protected]>
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (208649 => 208650)
--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-11-12 17:13:39 UTC (rev 208649)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-11-12 17:33:19 UTC (rev 208650)
@@ -35,6 +35,7 @@
#if USE(APPLE_INTERNAL_SDK) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
#import <WebKitAdditions/WebPlaybackControlsControllerAdditions.h>
#else
+#import <WebCore/AVKitSPI.h>
#import <wtf/RetainPtr.h>
#import <wtf/Vector.h>
@@ -41,10 +42,11 @@
OBJC_CLASS AVValueTiming;
WEBCORE_EXPORT
-@interface WebPlaybackControlsManager : NSObject {
+@interface WebPlaybackControlsManager : NSObject <AVFunctionBarPlaybackControlsControlling> {
NSTimeInterval _contentDuration;
RetainPtr<AVValueTiming> _timing;
+ NSTimeInterval _seekToTime;
RetainPtr<NSArray> _seekableTimeRanges;
BOOL _hasEnabledAudio;
BOOL _hasEnabledVideo;
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm (208649 => 208650)
--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-11-12 17:13:39 UTC (rev 208649)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-11-12 17:33:19 UTC (rev 208650)
@@ -39,6 +39,7 @@
using namespace WebCore;
@synthesize contentDuration=_contentDuration;
+@synthesize seekToTime=_seekToTime;
@synthesize hasEnabledAudio=_hasEnabledAudio;
@synthesize hasEnabledVideo=_hasEnabledVideo;
@synthesize rate=_rate;
@@ -75,6 +76,18 @@
_seekableTimeRanges = timeRanges;
}
+- (BOOL)isSeeking
+{
+ return NO;
+}
+
+- (void)seekToTime:(NSTimeInterval)time toleranceBefore:(NSTimeInterval)toleranceBefore toleranceAfter:(NSTimeInterval)toleranceAfter
+{
+ UNUSED_PARAM(toleranceBefore);
+ UNUSED_PARAM(toleranceAfter);
+ _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->seekToTime(time);
+}
+
- (void)setAudioMediaSelectionOptions:(const Vector<WTF::String>&)options withSelectedIndex:(NSUInteger)selectedIndex
{
UNUSED_PARAM(options);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
