Diff
Modified: trunk/ChangeLog (284857 => 284858)
--- trunk/ChangeLog 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/ChangeLog 2021-10-26 07:36:09 UTC (rev 284858)
@@ -1,3 +1,12 @@
+2021-10-26 Adrian Perez de Castro <[email protected]>
+
+ Multiple build issues with ENABLE_VIDEO=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=232264
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_SESSION depend on ENABLE_VIDEO.
+
2021-10-25 Jonathan Bedard <[email protected]>
Add GitHub usernames for bedison and darinadler
Modified: trunk/Source/WebCore/ChangeLog (284857 => 284858)
--- trunk/Source/WebCore/ChangeLog 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/ChangeLog 2021-10-26 07:36:09 UTC (rev 284858)
@@ -1,3 +1,22 @@
+2021-10-26 Adrian Perez de Castro <[email protected]>
+
+ Multiple build issues with ENABLE_VIDEO=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=232264
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests needed.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::isSimpleImage): Guard usage of HTMLMediaElement with ENABLE(VIDEO).
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::textRecognitionCandidateElement const): Ditto.
+ * platform/graphics/BifurcatedGraphicsContext.cpp: Ditto.
+ * platform/graphics/displaylists/DisplayListRecorder.h: Guard usage of MediaPlayer with
+ ENABLE(VIDEO).
+ * platform/graphics/displaylists/DisplayListRecorderImpl.cpp: Ditto.
+ * platform/graphics/displaylists/DisplayListRecorderImpl.h: Ditto.
+
2021-10-26 Fujii Hironori <[email protected]>
[WebCore] Remove unneeded WTF:: namespace prefix
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (284857 => 284858)
--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2021-10-26 07:36:09 UTC (rev 284858)
@@ -531,9 +531,11 @@
|| (is<HTMLImageElement>(node) && downcast<HTMLImageElement>(node)->hasAttributeWithoutSynchronization(usemapAttr)))
return false;
+#if ENABLE(VIDEO)
// Exclude video and audio elements.
if (is<HTMLMediaElement>(node))
return false;
+#endif // ENABLE(VIDEO)
return true;
}
Modified: trunk/Source/WebCore/page/EventHandler.cpp (284857 => 284858)
--- trunk/Source/WebCore/page/EventHandler.cpp 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2021-10-26 07:36:09 UTC (rev 284858)
@@ -2543,8 +2543,10 @@
return candidateElement;
#endif
+#if ENABLE(VIDEO)
if (is<HTMLVideoElement>(*candidateElement))
return nullptr;
+#endif // ENABLE(VIDEO)
return candidateElement;
}
Modified: trunk/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp (284857 => 284858)
--- trunk/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp 2021-10-26 07:36:09 UTC (rev 284858)
@@ -297,11 +297,13 @@
return result;
}
+#if ENABLE(VIDEO)
void BifurcatedGraphicsContext::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
{
m_primaryContext.paintFrameForMedia(player, destination);
m_secondaryContext.paintFrameForMedia(player, destination);
}
+#endif // ENABLE(VIDEO)
void BifurcatedGraphicsContext::scale(const FloatSize& scale)
{
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h (284857 => 284858)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2021-10-26 07:36:09 UTC (rev 284858)
@@ -116,7 +116,9 @@
#endif
virtual void recordFillPath(const Path&) = 0;
virtual void recordFillEllipse(const FloatRect&) = 0;
+#if ENABLE(VIDEO)
virtual void recordPaintFrameForMedia(MediaPlayer&, const FloatRect& destination) = 0;
+#endif
virtual void recordStrokeRect(const FloatRect&, float) = 0;
#if ENABLE(INLINE_PATH_DATA)
virtual void recordStrokeLine(const LineData&) = 0;
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.cpp (284857 => 284858)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.cpp 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.cpp 2021-10-26 07:36:09 UTC (rev 284858)
@@ -342,10 +342,12 @@
append<FillEllipse>(rect);
}
+#if ENABLE(VIDEO)
void RecorderImpl::recordPaintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
{
append<PaintFrameForMedia>(player, destination);
}
+#endif // ENABLE(VIDEO)
void RecorderImpl::recordStrokeRect(const FloatRect& rect, float width)
{
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.h (284857 => 284858)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.h 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.h 2021-10-26 07:36:09 UTC (rev 284858)
@@ -114,7 +114,9 @@
#endif
void recordFillPath(const Path&) final;
void recordFillEllipse(const FloatRect&) final;
+#if ENABLE(VIDEO)
void recordPaintFrameForMedia(MediaPlayer&, const FloatRect& destination) final;
+#endif
void recordStrokeRect(const FloatRect&, float) final;
#if ENABLE(INLINE_PATH_DATA)
void recordStrokeLine(const LineData&) final;
Modified: trunk/Source/WebKit/ChangeLog (284857 => 284858)
--- trunk/Source/WebKit/ChangeLog 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebKit/ChangeLog 2021-10-26 07:36:09 UTC (rev 284858)
@@ -1,3 +1,13 @@
+2021-10-26 Adrian Perez de Castro <[email protected]>
+
+ Multiple build issues with ENABLE_VIDEO=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=232264
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp:
+ (WebKit::createShareableBitmap): Guard usage of RenderVideo with ENABLE(VIDEO).
+
2021-10-25 John Wilander <[email protected]>
Remove assert failure expectations after r284846 landed
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp (284857 => 284858)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp 2021-10-26 07:36:09 UTC (rev 284858)
@@ -71,6 +71,7 @@
return bitmap;
}
+#if ENABLE(VIDEO)
if (is<RenderVideo>(renderImage)) {
auto& renderVideo = downcast<RenderVideo>(renderImage);
Ref video = renderVideo.videoElement();
@@ -93,6 +94,7 @@
context->drawNativeImage(*image, imageSize, FloatRect { { }, imageSize }, FloatRect { { }, imageSize });
return bitmap;
}
+#endif // ENABLE(VIDEO)
auto* cachedImage = renderImage.cachedImage();
if (!cachedImage || cachedImage->errorOccurred())
Modified: trunk/Source/cmake/WebKitFeatures.cmake (284857 => 284858)
--- trunk/Source/cmake/WebKitFeatures.cmake 2021-10-26 07:23:01 UTC (rev 284857)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2021-10-26 07:36:09 UTC (rev 284858)
@@ -250,6 +250,7 @@
WEBKIT_OPTION_DEPEND(ENABLE_WEBASSEMBLY_B3JIT ENABLE_FTL_JIT)
WEBKIT_OPTION_DEPEND(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS ENABLE_REMOTE_INSPECTOR)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_CONTROLS_SCRIPT ENABLE_VIDEO)
+ WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SESSION ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SOURCE ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_STREAM ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_THUNDER ENABLE_ENCRYPTED_MEDIA)
