Title: [249531] trunk/Source/WebCore
- Revision
- 249531
- Author
- annu...@yandex.ru
- Date
- 2019-09-05 09:56:25 -0700 (Thu, 05 Sep 2019)
Log Message
Don't call PlatformMediaSessionManager methods when neither VIDEO nor WEB_AUDIO is enabled
https://bugs.webkit.org/show_bug.cgi?id=201508
Reviewed by Jer Noble.
Definitions of these methods are guarded with #if ENABLE(VIDEO) || ENABLE(WEB_AUDIO),
so calling them causes linking errors.
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setShouldDeactivateAudioSession):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::processWillSuspend):
(WebCore::Internals::processDidResume):
(WebCore::Internals::setIsPlayingToAutomotiveHeadUnit):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (249530 => 249531)
--- trunk/Source/WebCore/ChangeLog 2019-09-05 15:51:47 UTC (rev 249530)
+++ trunk/Source/WebCore/ChangeLog 2019-09-05 16:56:25 UTC (rev 249531)
@@ -1,3 +1,23 @@
+2019-09-05 Konstantin Tokarev <annu...@yandex.ru>
+
+ Don't call PlatformMediaSessionManager methods when neither VIDEO nor WEB_AUDIO is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=201508
+
+ Reviewed by Jer Noble.
+
+ Definitions of these methods are guarded with #if ENABLE(VIDEO) || ENABLE(WEB_AUDIO),
+ so calling them causes linking errors.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setShouldDeactivateAudioSession):
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+ (WebCore::Internals::processWillSuspend):
+ (WebCore::Internals::processDidResume):
+ (WebCore::Internals::setIsPlayingToAutomotiveHeadUnit):
+
2019-09-05 Keith Rollin <krol...@apple.com>
Fix implicit conversion that loses precision
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (249530 => 249531)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2019-09-05 15:51:47 UTC (rev 249530)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2019-09-05 16:56:25 UTC (rev 249531)
@@ -102,7 +102,9 @@
, m_incompleteImageBorderEnabled(settings.incompleteImageBorderEnabled())
, m_shouldDispatchSyntheticMouseEventsWhenModifyingSelection(settings.shouldDispatchSyntheticMouseEventsWhenModifyingSelection())
, m_shouldDispatchSyntheticMouseOutAfterSyntheticClick(settings.shouldDispatchSyntheticMouseOutAfterSyntheticClick())
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
, m_shouldDeactivateAudioSession(PlatformMediaSessionManager::shouldDeactivateAudioSession())
+#endif
, m_animatedImageDebugCanvasDrawingEnabled(settings.animatedImageDebugCanvasDrawingEnabled())
, m_userInterfaceDirectionPolicy(settings.userInterfaceDirectionPolicy())
, m_systemLayoutDirection(settings.systemLayoutDirection())
@@ -212,7 +214,9 @@
settings.setIncompleteImageBorderEnabled(m_incompleteImageBorderEnabled);
settings.setShouldDispatchSyntheticMouseEventsWhenModifyingSelection(m_shouldDispatchSyntheticMouseEventsWhenModifyingSelection);
settings.setShouldDispatchSyntheticMouseOutAfterSyntheticClick(m_shouldDispatchSyntheticMouseOutAfterSyntheticClick);
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
PlatformMediaSessionManager::setShouldDeactivateAudioSession(m_shouldDeactivateAudioSession);
+#endif
settings.setAnimatedImageDebugCanvasDrawingEnabled(m_animatedImageDebugCanvasDrawingEnabled);
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
@@ -1024,7 +1028,9 @@
void InternalSettings::setShouldDeactivateAudioSession(bool should)
{
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
PlatformMediaSessionManager::setShouldDeactivateAudioSession(should);
+#endif
}
// If you add to this class, make sure that you update the Backup class for test reproducability!
Modified: trunk/Source/WebCore/testing/Internals.cpp (249530 => 249531)
--- trunk/Source/WebCore/testing/Internals.cpp 2019-09-05 15:51:47 UTC (rev 249530)
+++ trunk/Source/WebCore/testing/Internals.cpp 2019-09-05 16:56:25 UTC (rev 249531)
@@ -485,7 +485,9 @@
PlatformMediaSessionManager::sharedManager().resetRestrictions();
PlatformMediaSessionManager::sharedManager().setWillIgnoreSystemInterruptions(true);
#endif
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
PlatformMediaSessionManager::sharedManager().setIsPlayingToAutomotiveHeadUnit(false);
+#endif
#if ENABLE(ACCESSIBILITY)
AXObjectCache::setEnhancedUserInterfaceAccessibility(false);
AXObjectCache::disableAccessibility();
@@ -5104,12 +5106,16 @@
void Internals::processWillSuspend()
{
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
PlatformMediaSessionManager::sharedManager().processWillSuspend();
+#endif
}
void Internals::processDidResume()
{
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
PlatformMediaSessionManager::sharedManager().processDidResume();
+#endif
}
void Internals::testDictionaryLogging()
@@ -5139,7 +5145,9 @@
void Internals::setIsPlayingToAutomotiveHeadUnit(bool isPlaying)
{
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
PlatformMediaSessionManager::sharedManager().setIsPlayingToAutomotiveHeadUnit(isPlaying);
+#endif
}
Internals::TextIndicatorInfo::TextIndicatorInfo()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
