Title: [236201] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 236201
- Author
- [email protected]
- Date
- 2018-09-19 06:49:38 -0700 (Wed, 19 Sep 2018)
Log Message
Merge r235895 - 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: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236200 => 236201)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-19 13:49:33 UTC (rev 236200)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-19 13:49:38 UTC (rev 236201)
@@ -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-18 Chris Dumez <[email protected]>
"DidFirstVisuallyNonEmptyLayout" callback does not get called when restoring a page from PageCache
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/page/Page.cpp (236200 => 236201)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/page/Page.cpp 2018-09-19 13:49:33 UTC (rev 236200)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/page/Page.cpp 2018-09-19 13:49:38 UTC (rev 236201)
@@ -242,7 +242,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); }))
@@ -1511,10 +1513,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))
@@ -1522,6 +1527,7 @@
else
chrome().client().clearPlaybackControlsManager();
}
+#endif
void Page::setMuted(MediaProducer::MutedStateFlags muted)
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/page/Page.h (236200 => 236201)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/page/Page.h 2018-09-19 13:49:33 UTC (rev 236200)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/page/Page.h 2018-09-19 13:49:38 UTC (rev 236201)
@@ -686,7 +686,9 @@
std::optional<std::pair<MediaCanStartListener&, Document&>> takeAnyMediaCanStartListener();
+#if ENABLE(VIDEO)
void playbackControlsManagerUpdateTimerFired();
+#endif
Vector<Ref<PluginViewBase>> pluginViews();
@@ -865,7 +867,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
