Title: [208682] trunk/Source/WebCore
- Revision
- 208682
- Author
- o...@webkit.org
- Date
- 2016-11-14 07:39:43 -0800 (Mon, 14 Nov 2016)
Log Message
Fix various --minimal build issue
https://bugs.webkit.org/show_bug.cgi?id=164479
Reviewed by Darin Adler.
* dom/Node.cpp:
* platform/audio/PlatformMediaSessionManager.cpp:
* testing/Internals.cpp:
(WebCore::Internals::captionsStyleSheetOverride):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208681 => 208682)
--- trunk/Source/WebCore/ChangeLog 2016-11-14 15:39:27 UTC (rev 208681)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 15:39:43 UTC (rev 208682)
@@ -1,5 +1,17 @@
2016-11-14 Csaba Osztrogonác <o...@webkit.org>
+ Fix various --minimal build issue
+ https://bugs.webkit.org/show_bug.cgi?id=164479
+
+ Reviewed by Darin Adler.
+
+ * dom/Node.cpp:
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ * testing/Internals.cpp:
+ (WebCore::Internals::captionsStyleSheetOverride):
+
+2016-11-14 Csaba Osztrogonác <o...@webkit.org>
+
Fix the !ENABLE(VIDEO_TRACK) build
https://bugs.webkit.org/show_bug.cgi?id=164476
Modified: trunk/Source/WebCore/dom/Node.cpp (208681 => 208682)
--- trunk/Source/WebCore/dom/Node.cpp 2016-11-14 15:39:27 UTC (rev 208681)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-11-14 15:39:43 UTC (rev 208682)
@@ -41,6 +41,7 @@
#include "ElementTraversal.h"
#include "EventDispatcher.h"
#include "EventHandler.h"
+#include "ExceptionCode.h"
#include "FrameView.h"
#include "HTMLBodyElement.h"
#include "HTMLCollection.h"
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (208681 => 208682)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-11-14 15:39:27 UTC (rev 208681)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-11-14 15:39:43 UTC (rev 208682)
@@ -26,7 +26,6 @@
#include "config.h"
#include "PlatformMediaSessionManager.h"
-#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
#include "AudioSession.h"
#include "Document.h"
@@ -37,12 +36,14 @@
namespace WebCore {
#if !PLATFORM(MAC)
-
void PlatformMediaSessionManager::updateNowPlayingInfoIfNecessary()
{
}
+#endif
-#if !PLATFORM(IOS)
+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
+
+#if !PLATFORM(COCOA)
static PlatformMediaSessionManager* platformMediaSessionManager = nullptr;
PlatformMediaSessionManager& PlatformMediaSessionManager::sharedManager()
@@ -56,10 +57,8 @@
{
return platformMediaSessionManager;
}
-#endif // !PLATFORM(IOS)
+#endif // !PLATFORM(COCOA)
-#endif // !PLATFORM(MAC)
-
PlatformMediaSessionManager::PlatformMediaSessionManager()
: m_systemSleepListener(SystemSleepListener::create(*this))
{
@@ -441,6 +440,6 @@
return found;
}
-}
+#endif // ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
-#endif
+} // namespace WebCore
Modified: trunk/Source/WebCore/testing/Internals.cpp (208681 => 208682)
--- trunk/Source/WebCore/testing/Internals.cpp 2016-11-14 15:39:27 UTC (rev 208681)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-11-14 15:39:43 UTC (rev 208682)
@@ -2527,7 +2527,7 @@
#if ENABLE(VIDEO_TRACK)
return document->page()->group().captionPreferences().captionsStyleSheetOverride();
#else
- return emptyString();
+ return String { emptyString() };
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
