Title: [215282] trunk/Source/WebKit2
- Revision
- 215282
- Author
- [email protected]
- Date
- 2017-04-12 12:56:01 -0700 (Wed, 12 Apr 2017)
Log Message
Another 32 bit build fix.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::mediaPlaybackControlsView):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (215281 => 215282)
--- trunk/Source/WebKit2/ChangeLog 2017-04-12 19:49:00 UTC (rev 215281)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-12 19:56:01 UTC (rev 215282)
@@ -1,3 +1,11 @@
+2017-04-12 Beth Dakin <[email protected]>
+
+ Another 32 bit build fix.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::mediaPlaybackControlsView):
+
2017-04-12 Alex Christensen <[email protected]>
Stop using didReceiveDataArray callback on El Capitan
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (215281 => 215282)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2017-04-12 19:49:00 UTC (rev 215281)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2017-04-12 19:56:01 UTC (rev 215282)
@@ -515,7 +515,9 @@
void updateTouchBar();
NSTouchBar *currentTouchBar() const { return m_currentTouchBar.get(); }
NSCandidateListTouchBarItem *candidateListTouchBarItem() const;
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
AVTouchBarScrubber *mediaPlaybackControlsView() const;
+#endif
NSTouchBar *textTouchBar() const;
void dismissTextTouchBarPopoverItemWithIdentifier(NSString *);
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (215281 => 215282)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-04-12 19:49:00 UTC (rev 215281)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-04-12 19:56:01 UTC (rev 215282)
@@ -906,14 +906,14 @@
return isRichlyEditable() ? m_richTextCandidateListTouchBarItem.get() : m_plainTextCandidateListTouchBarItem.get();
}
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
AVTouchBarScrubber *WebViewImpl::mediaPlaybackControlsView() const
{
-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
if (m_page->hasActiveVideoForControlsManager())
return m_mediaPlaybackControlsView.get();
-#endif
return nil;
}
+#endif
bool WebViewImpl::useMediaPlaybackControlsView() const
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
