Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-11-01 18:32:27 UTC (rev 237689)
@@ -1,3 +1,25 @@
+2018-11-01 Claudio Saavedra <csaave...@igalia.com>
+
+ Fix build with VIDEO and WEB_AUDIO disabled
+ https://bugs.webkit.org/show_bug.cgi?id=191147
+
+ Reviewed by Philippe Normand.
+
+ Supported or not, there were a few build fixes needed
+ to be able to build WebKit with media disabled. Mostly
+ low-hanging fruits.
+
+ * Modules/mediasource/VideoPlaybackQuality.cpp:
+ * Modules/mediasource/VideoPlaybackQuality.h:
+ * Modules/mediasource/VideoPlaybackQuality.idl:
+ * dom/Document.cpp:
+ (WebCore::Document::dispatchFullScreenChangeOrErrorEvent):
+ * inspector/agents/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::InspectorDOMAgent):
+ (WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
+ * inspector/agents/InspectorDOMAgent.h:
+ * rendering/RenderThemeGtk.cpp:
+
2018-10-11 Jiewen Tan <jiewen_...@apple.com>
Only report resource timing to parent frame for the first iframe load
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.cpp (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.cpp 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.cpp 2018-11-01 18:32:27 UTC (rev 237689)
@@ -26,6 +26,8 @@
#include "config.h"
#include "VideoPlaybackQuality.h"
+#if ENABLE(VIDEO)
+
namespace WebCore {
Ref<VideoPlaybackQuality> VideoPlaybackQuality::create(double creationTime, unsigned totalVideoFrames, unsigned droppedVideoFrames, unsigned corruptedVideoFrames, double totalFrameDelay)
@@ -43,3 +45,5 @@
}
}
+
+#endif // ENABLE(VIDEO)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.h (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.h 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.h 2018-11-01 18:32:27 UTC (rev 237689)
@@ -25,6 +25,8 @@
#pragma once
+#if ENABLE(VIDEO)
+
#include <wtf/Ref.h>
#include <wtf/RefCounted.h>
@@ -52,3 +54,5 @@
};
} // namespace WebCore
+
+#endif // ENABLE(VIDEO)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.idl (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.idl 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediasource/VideoPlaybackQuality.idl 2018-11-01 18:32:27 UTC (rev 237689)
@@ -24,7 +24,7 @@
*/
[
- Conditional=MEDIA_SOURCE,
+ Conditional=VIDEO,
NoInterfaceObject,
ImplementationLacksVTable,
] interface VideoPlaybackQuality {
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.cpp (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.cpp 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/Document.cpp 2018-11-01 18:32:27 UTC (rev 237689)
@@ -6412,6 +6412,8 @@
#if ENABLE(VIDEO)
if (shouldNotifyMediaElement && is<HTMLMediaElement>(*node))
downcast<HTMLMediaElement>(*node).enteredOrExitedFullscreen();
+#else
+ UNUSED_PARAM(shouldNotifyMediaElement);
#endif
node->dispatchEvent(Event::create(eventName, Event::CanBubble::Yes, Event::IsCancelable::No));
}
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/RenderThemeGtk.cpp (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/RenderThemeGtk.cpp 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/RenderThemeGtk.cpp 2018-11-01 18:32:27 UTC (rev 237689)
@@ -295,6 +295,7 @@
}
#endif // !GTK_CHECK_VERSION(3, 20, 0)
+#if ENABLE(VIDEO)
static bool nodeHasPseudo(Node& node, const char* pseudo)
{
return is<Element>(node) && downcast<Element>(node).pseudo() == pseudo;
@@ -312,6 +313,7 @@
return element.classNames().contains(className);
}
+#endif // ENABLE(VIDEO)
RenderThemeGtk::~RenderThemeGtk() = default;
Modified: releases/WebKitGTK/webkit-2.22/Tools/ChangeLog (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Tools/ChangeLog 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Tools/ChangeLog 2018-11-01 18:32:27 UTC (rev 237689)
@@ -1,3 +1,13 @@
+2018-11-01 Claudio Saavedra <csaave...@igalia.com>
+
+ Fix build with VIDEO and WEB_AUDIO disabled
+ https://bugs.webkit.org/show_bug.cgi?id=191147
+
+ Reviewed by Philippe Normand.
+
+ * MiniBrowser/gtk/main.c:
+ (main): Condition GST includes and calls
+
2018-10-26 Alicia Boya García <ab...@igalia.com>
[MSE][WTF][Media] Invalid MediaTime should be falsy
Modified: releases/WebKitGTK/webkit-2.22/Tools/MiniBrowser/gtk/main.c (237688 => 237689)
--- releases/WebKitGTK/webkit-2.22/Tools/MiniBrowser/gtk/main.c 2018-11-01 18:18:14 UTC (rev 237688)
+++ releases/WebKitGTK/webkit-2.22/Tools/MiniBrowser/gtk/main.c 2018-11-01 18:32:27 UTC (rev 237689)
@@ -29,7 +29,9 @@
#include "BrowserWindow.h"
#include <errno.h>
+#if ENABLE_WEB_AUDIO || ENABLE_VIDEO
#include <gst/gst.h>
+#endif
#include <gtk/gtk.h>
#include <string.h>
#include <webkit2/webkit2.h>
@@ -479,7 +481,9 @@
GOptionContext *context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, commandLineOptions, 0);
g_option_context_add_group(context, gtk_get_option_group(TRUE));
+#if ENABLE_WEB_AUDIO || ENABLE_VIDEO
g_option_context_add_group(context, gst_init_get_option_group());
+#endif
WebKitSettings *webkitSettings = webkit_settings_new();
webkit_settings_set_enable_developer_extras(webkitSettings, TRUE);
