Attachment 349395 Details for Bug 189500 – patch

[patch] patch

bug-189500-20180911172017.patch (text/plain), 3.46 KB, created by Pablo Saavedra on 2018-09-11 08:20:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pablo Saavedra

Created: 2018-09-11 08:20:19 PDT

Size: 3.46 KB

patch

obsolete

>Subversion Revision: 235894
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e3cf292aeb808cce101e61da495200573c73ce3f..a79cff0560aa14af7582ccb663290c482a45bf32 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-09-11  Pablo Saavedra  <psaavedra@igalia.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        * page/Page.cpp:
>+        (WebCore::Page::Page):
>+        (WebCore::Page::schedulePlaybackControlsManagerUpdate):
>+        * page/Page.h:
>+
> 2018-09-11  Frederic Wang  <fwang@igalia.com>
> 
>         Refactor filter list checking code
>diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
>index f3ac3458efc505ec02ff174927e2c975b835f9fb..4ab40a748ce212f8ef99e9796151d3da6f1cb259 100644
>--- a/Source/WebCore/page/Page.cpp
>+++ b/Source/WebCore/page/Page.cpp
>@@ -243,7 +243,9 @@ Page::Page(PageConfiguration&& pageConfiguration)
>     , 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::updateIsPlayingMedia(uint64_t sourceElementID)
> 
> 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 @@ void Page::playbackControlsManagerUpdateTimerFired()
>     else
>         chrome().client().clearPlaybackControlsManager();
> }
>+#endif
> 
> void Page::setMuted(MediaProducer::MutedStateFlags muted)
> {
>diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
>index a78cca499bbcbd30b60e527794821f380a605c1c..6c1d432f9da25ced82be358b9919786cbf9f62c0 100644
>--- a/Source/WebCore/page/Page.h
>+++ b/Source/WebCore/page/Page.h
>@@ -691,7 +691,9 @@ private:
> 
>     std::optional<std::pair<MediaCanStartListener&, Document&>> takeAnyMediaCanStartListener();
> 
>+#if ENABLE(VIDEO)
>     void playbackControlsManagerUpdateTimerFired();
>+#endif
> 
>     Vector<Ref<PluginViewBase>> pluginViews();
> 
>@@ -870,7 +872,9 @@ private:
> 
>     MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
> 
>+#if ENABLE(VIDEO)
>     Timer m_playbackControlsManagerUpdateTimer;
>+#endif
> 
>     bool m_allowsMediaDocumentInlinePlayback { false };
>     bool m_allowsPlaybackControlsForAutoplayingAudio { false };

Actions: View | Formatted Diff | Diff

Attachments on bug 189500: 349395