Title: [215283] trunk/Source/WebKit2
- Revision
- 215283
- Author
- [email protected]
- Date
- 2017-04-12 13:04:42 -0700 (Wed, 12 Apr 2017)
Log Message
More 32-bit build fix.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _mediaPlaybackControlsView]):
(-[WKWebView _addMediaPlaybackControlsView:]):
* UIProcess/API/mac/WKView.mm:
(-[WKView _mediaPlaybackControlsView]):
(-[WKView _addMediaPlaybackControlsView:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (215282 => 215283)
--- trunk/Source/WebKit2/ChangeLog 2017-04-12 19:56:01 UTC (rev 215282)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-12 20:04:42 UTC (rev 215283)
@@ -1,5 +1,16 @@
2017-04-12 Beth Dakin <[email protected]>
+ More 32-bit build fix.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _mediaPlaybackControlsView]):
+ (-[WKWebView _addMediaPlaybackControlsView:]):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _mediaPlaybackControlsView]):
+ (-[WKView _addMediaPlaybackControlsView:]):
+
+2017-04-12 Beth Dakin <[email protected]>
+
Another 32 bit build fix.
* UIProcess/Cocoa/WebViewImpl.h:
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (215282 => 215283)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-04-12 19:56:01 UTC (rev 215282)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-04-12 20:04:42 UTC (rev 215283)
@@ -5005,7 +5005,7 @@
#endif
}
-- (AVTouchBarScrubber *)_mediaPlaybackControlsView
+- (id)_mediaPlaybackControlsView
{
#if HAVE(TOUCH_BAR)
return _impl->clientWantsMediaPlaybackControlsView() ? _impl->mediaPlaybackControlsView() : nil;
@@ -5015,7 +5015,7 @@
}
// This method is for subclasses to override.
-- (void)_addMediaPlaybackControlsView:(AVTouchBarScrubber *)mediaPlaybackControlsView
+- (void)_addMediaPlaybackControlsView:(id)mediaPlaybackControlsView
{
}
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (215282 => 215283)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-04-12 19:56:01 UTC (rev 215282)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-04-12 20:04:42 UTC (rev 215283)
@@ -1573,7 +1573,7 @@
#endif
}
-- (AVTouchBarScrubber *)_mediaPlaybackControlsView
+- (id)_mediaPlaybackControlsView
{
#if HAVE(TOUCH_BAR)
return _data->_impl->clientWantsMediaPlaybackControlsView() ? _data->_impl->mediaPlaybackControlsView() : nil;
@@ -1583,7 +1583,7 @@
}
// This method is for subclasses to override.
-- (void)_addMediaPlaybackControlsView:(AVTouchBarScrubber *)mediaPlaybackControlsView
+- (void)_addMediaPlaybackControlsView:(id)mediaPlaybackControlsView
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
