Title: [235895] trunk/Source/WebCore
- Revision
- 235895
- Author
- [email protected]
- Date
- 2018-09-11 09:07:45 -0700 (Tue, 11 Sep 2018)
Log Message
playbackControlsManagerUpdateTimerFired and
m_playbackControlsManagerUpdateTimer must be
guarded with ENABLE(VIDEO), otherwise the following
error occurs with the VIDEO feature turned off:
error: 'MediaElementSession' has not been declared
Add missing #if ENABLE(VIDEO) Page.cpp and Page.h
https://bugs.webkit.org/show_bug.cgi?id=189500
Patch by Pablo Saavedra <[email protected]> on 2018-09-11
Reviewed by Anders Carlsson.
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::schedulePlaybackControlsManagerUpdate):
* page/Page.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235894 => 235895)
--- trunk/Source/WebCore/ChangeLog 2018-09-11 12:48:33 UTC (rev 235894)
+++ trunk/Source/WebCore/ChangeLog 2018-09-11 16:07:45 UTC (rev 235895)
@@ -1,3 +1,22 @@
+2018-09-11 Pablo Saavedra <[email protected]>
+
+ playbackControlsManagerUpdateTimerFired and
+ m_playbackControlsManagerUpdateTimer must be
+ guarded with ENABLE(VIDEO), otherwise the following
+ error occurs with the VIDEO feature turned off:
+
+ error: 'MediaElementSession' has not been declared
+
+ Add missing #if ENABLE(VIDEO) Page.cpp and Page.h
+ https://bugs.webkit.org/show_bug.cgi?id=189500
+
+ Reviewed by Anders Carlsson.
+
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::schedulePlaybackControlsManagerUpdate):
+ * page/Page.h:
+
2018-09-11 Frederic Wang <[email protected]>
Refactor filter list checking code
Modified: trunk/Source/WebCore/page/Page.cpp (235894 => 235895)
--- trunk/Source/WebCore/page/Page.cpp 2018-09-11 12:48:33 UTC (rev 235894)
+++ trunk/Source/WebCore/page/Page.cpp 2018-09-11 16:07:45 UTC (rev 235895)
@@ -243,7 +243,9 @@
, m_userContentProvider(*WTFMove(pageConfiguration.userContentProvider))
, m_visitedLinkStore(*WTFMove(pageConfiguration.visitedLinkStore))
, m_sessionID(PAL::SessionID::defaultSessionID())
+#if ENABLE(VIDEO)
, m_playbackControlsManagerUpdateTimer(*this, &Page::playbackControlsManagerUpdateTimerFired)
+#endif
, m_isUtilityPage(isUtilityPageChromeClient(chrome().client()))
, m_performanceMonitor(isUtilityPage() ? nullptr : std::make_unique<PerformanceMonitor>(*this))
, m_lowPowerModeNotifier(std::make_unique<LowPowerModeNotifier>([this](bool isLowPowerModeEnabled) { handleLowModePowerChange(isLowPowerModeEnabled); }))
@@ -1513,10 +1515,13 @@
void Page::schedulePlaybackControlsManagerUpdate()
{
+#if ENABLE(VIDEO)
if (!m_playbackControlsManagerUpdateTimer.isActive())
m_playbackControlsManagerUpdateTimer.startOneShot(0_s);
+#endif
}
+#if ENABLE(VIDEO)
void Page::playbackControlsManagerUpdateTimerFired()
{
if (auto bestMediaElement = HTMLMediaElement::bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose::ControlsManager))
@@ -1524,6 +1529,7 @@
else
chrome().client().clearPlaybackControlsManager();
}
+#endif
void Page::setMuted(MediaProducer::MutedStateFlags muted)
{
Modified: trunk/Source/WebCore/page/Page.h (235894 => 235895)
--- trunk/Source/WebCore/page/Page.h 2018-09-11 12:48:33 UTC (rev 235894)
+++ trunk/Source/WebCore/page/Page.h 2018-09-11 16:07:45 UTC (rev 235895)
@@ -691,7 +691,9 @@
std::optional<std::pair<MediaCanStartListener&, Document&>> takeAnyMediaCanStartListener();
+#if ENABLE(VIDEO)
void playbackControlsManagerUpdateTimerFired();
+#endif
Vector<Ref<PluginViewBase>> pluginViews();
@@ -870,7 +872,9 @@
MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
+#if ENABLE(VIDEO)
Timer m_playbackControlsManagerUpdateTimer;
+#endif
bool m_allowsMediaDocumentInlinePlayback { false };
bool m_allowsPlaybackControlsForAutoplayingAudio { false };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
