Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1,3 +1,47 @@
+2021-04-06 Mike Gorse <[email protected]>
+
+ Build fails when video is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=224198
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add #if ENABLE(VIDEO) where needed.
+
+ * editing/markup.cpp:
+ (WebCore::createPageForSanitizingWebContent):
+ * page/Page.cpp:
+ * page/Page.h:
+ * platform/graphics/GraphicsContext.cpp:
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/GraphicsContextGL.h:
+ * platform/graphics/GraphicsContextImpl.h:
+ * platform/graphics/cairo/GraphicsContextImplCairo.cpp:
+ * platform/graphics/cairo/GraphicsContextImplCairo.h:
+ * platform/graphics/displaylists/DisplayList.cpp:
+ (WebCore::DisplayList::DisplayList::append):
+ * platform/graphics/displaylists/DisplayListItemBuffer.cpp:
+ (WebCore::DisplayList::ItemHandle::apply):
+ (WebCore::DisplayList::ItemHandle::destroy):
+ (WebCore::DisplayList::ItemHandle::safeCopy const):
+ * platform/graphics/displaylists/DisplayListItemType.cpp:
+ (WebCore::DisplayList::sizeOfItemInBytes):
+ (WebCore::DisplayList::isDrawingItem):
+ (WebCore::DisplayList::isInlineItem):
+ * platform/graphics/displaylists/DisplayListItemType.h:
+ * platform/graphics/displaylists/DisplayListItems.cpp:
+ (WebCore::DisplayList::operator<<):
+ * platform/graphics/displaylists/DisplayListItems.h:
+ * platform/graphics/displaylists/DisplayListRecorder.cpp:
+ * platform/graphics/displaylists/DisplayListRecorder.h:
+ * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
+ * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+ * platform/graphics/win/GraphicsContextImplDirect2D.cpp:
+ * platform/graphics/win/GraphicsContextImplDirect2D.h:
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::dataChanged):
+
2021-03-28 Philippe Normand <[email protected]>
REGRESSION(r274527): [GStreamer] media/webaudio-background-playback.html now failing
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/markup.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/markup.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/markup.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -183,7 +183,9 @@
auto pageConfiguration = pageConfigurationWithEmptyClients(PAL::SessionID::defaultSessionID());
auto page = makeUnique<Page>(WTFMove(pageConfiguration));
+#if ENABLE(VIDEO)
page->settings().setMediaEnabled(false);
+#endif
page->settings().setScriptEnabled(false);
page->settings().setHTMLParserScriptingFlagPolicy(HTMLParserScriptingFlagPolicy::Enabled);
page->settings().setPluginsEnabled(false);
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Page.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Page.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Page.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -2099,13 +2099,13 @@
chrome().client().clearPlaybackControlsManager();
}
-#endif
-
void Page::playbackControlsMediaEngineChanged()
{
chrome().client().playbackControlsMediaEngineChanged();
}
+#endif
+
void Page::setMuted(MediaProducer::MutedStateFlags muted)
{
if (m_mutedState == muted)
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Page.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Page.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Page.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -693,7 +693,9 @@
bool isAudioMuted() const { return m_mutedState & MediaProducer::AudioIsMuted; }
bool isMediaCaptureMuted() const { return m_mutedState & MediaProducer::MediaStreamCaptureIsMuted; };
void schedulePlaybackControlsManagerUpdate();
+#if ENABLE(VIDEO)
void playbackControlsMediaEngineChanged();
+#endif
WEBCORE_EXPORT void setMuted(MediaProducer::MutedStateFlags);
WEBCORE_EXPORT void stopMediaCapture();
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContext.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContext.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContext.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1302,6 +1302,7 @@
#endif
+#if ENABLE(VIDEO)
void GraphicsContext::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
{
if (paintingDisabled())
@@ -1314,5 +1315,6 @@
player.playerPrivate()->paintCurrentFrameInContext(*this, destination);
}
+#endif
}
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContext.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContext.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContext.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -516,7 +516,9 @@
void setContentfulPaintDetected() { m_contenfulPaintDetected = true; }
bool contenfulPaintDetected() const { return m_contenfulPaintDetected; }
+#if ENABLE(VIDEO)
WEBCORE_EXPORT void paintFrameForMedia(MediaPlayer&, const FloatRect& destination);
+#endif
#if OS(WINDOWS)
HDC getWindowsContext(const IntRect&, bool supportAlphaBlend); // The passed in rect is used to create a bitmap for compositing inside transparency layers.
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContextGL.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContextGL.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContextGL.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1307,7 +1307,9 @@
// Returns interface for CV interaction if the functionality is present.
virtual GraphicsContextGLCV* asCV() = 0;
#endif
+#if ENABLE(VIDEO)
virtual bool copyTextureFromMedia(MediaPlayer&, PlatformGLObject texture, GCGLenum target, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY) = 0;
+#endif
IntSize getInternalFramebufferSize() const { return IntSize(m_currentWidth, m_currentHeight); }
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContextImpl.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContextImpl.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/GraphicsContextImpl.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -104,8 +104,10 @@
virtual IntRect clipBounds() = 0;
virtual void clipToImageBuffer(ImageBuffer&, const FloatRect&) = 0;
virtual void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&& drawingFunction) = 0;
+#if ENABLE(VIDEO)
virtual void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) = 0;
virtual bool canPaintFrameForMedia(const MediaPlayer&) const = 0;
+#endif
virtual void applyDeviceScaleFactor(float) = 0;
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -419,10 +419,12 @@
// FIXME: Not implemented.
}
+#if ENABLE(VIDEO)
void GraphicsContextImplCairo::paintFrameForMedia(MediaPlayer&, const FloatRect&)
{
// FIXME: Not implemented.
}
+#endif
} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -105,8 +105,10 @@
IntRect clipBounds() override;
void clipToImageBuffer(ImageBuffer&, const FloatRect&) override;
void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&&) override;
+#if ENABLE(VIDEO)
void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) override;
bool canPaintFrameForMedia(const MediaPlayer&) const override { return false; }
+#endif
void applyDeviceScaleFactor(float) override;
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -289,8 +289,10 @@
return append<MetaCommandChangeItemBuffer>(item.get<MetaCommandChangeItemBuffer>());
case ItemType::PutImageData:
return append<PutImageData>(item.get<PutImageData>());
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia:
return append<PaintFrameForMedia>(item.get<PaintFrameForMedia>());
+#endif
case ItemType::StrokeRect:
return append<StrokeRect>(item.get<StrokeRect>());
case ItemType::StrokeLine:
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -236,10 +236,12 @@
get<PutImageData>().apply(context);
return;
}
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia: {
get<PaintFrameForMedia>().apply(context);
return;
}
+#endif
case ItemType::StrokeRect: {
get<StrokeRect>().apply(context);
return;
@@ -470,10 +472,12 @@
static_assert(std::is_trivially_destructible<MetaCommandChangeItemBuffer>::value);
return;
}
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia: {
static_assert(std::is_trivially_destructible<PaintFrameForMedia>::value);
return;
}
+#endif
case ItemType::Restore: {
static_assert(std::is_trivially_destructible<Restore>::value);
return;
@@ -660,8 +664,10 @@
return copyInto<MetaCommandChangeDestinationImageBuffer>(*this, itemOffset);
case ItemType::MetaCommandChangeItemBuffer:
return copyInto<MetaCommandChangeItemBuffer>(*this, itemOffset);
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia:
return copyInto<PaintFrameForMedia>(*this, itemOffset);
+#endif
case ItemType::Restore:
return copyInto<Restore>(*this, itemOffset);
case ItemType::Rotate:
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -134,8 +134,10 @@
return sizeof(MetaCommandChangeItemBuffer);
case ItemType::PutImageData:
return sizeof(PutImageData);
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia:
return sizeof(PaintFrameForMedia);
+#endif
case ItemType::StrokeRect:
return sizeof(StrokeRect);
case ItemType::StrokeLine:
@@ -229,7 +231,9 @@
case ItemType::FillRectWithGradient:
case ItemType::FillRectWithRoundedHole:
case ItemType::FillRoundedRect:
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia:
+#endif
case ItemType::PutImageData:
case ItemType::StrokeEllipse:
#if ENABLE(INLINE_PATH_DATA)
@@ -300,7 +304,9 @@
case ItemType::FlushContext:
case ItemType::MetaCommandChangeDestinationImageBuffer:
case ItemType::MetaCommandChangeItemBuffer:
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia:
+#endif
case ItemType::Restore:
case ItemType::Rotate:
case ItemType::Save:
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -80,7 +80,9 @@
MetaCommandChangeDestinationImageBuffer,
MetaCommandChangeItemBuffer,
PutImageData,
+#if ENABLE(VIDEO)
PaintFrameForMedia,
+#endif
StrokeRect,
StrokeLine,
#if ENABLE(INLINE_PATH_DATA)
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -803,6 +803,7 @@
return ts;
}
+#if ENABLE(VIDEO)
PaintFrameForMedia::PaintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
: m_identifier(player.identifier())
, m_destination(destination)
@@ -820,6 +821,7 @@
ts.dumpProperty("destination", item.destination());
return ts;
}
+#endif
Optional<FloatRect> StrokeRect::localBounds(const GraphicsContext&) const
{
@@ -1062,7 +1064,9 @@
case ItemType::MetaCommandChangeDestinationImageBuffer: ts << "meta-command-change-destination-image-buffer"; break;
case ItemType::MetaCommandChangeItemBuffer: ts << "meta-command-change-item-buffer"; break;
case ItemType::PutImageData: ts << "put-image-data"; break;
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia: ts << "paint-frame-for-media"; break;
+#endif
case ItemType::StrokeRect: ts << "stroke-rect"; break;
case ItemType::StrokeLine: ts << "stroke-line"; break;
#if ENABLE(INLINE_PATH_DATA)
@@ -1228,9 +1232,11 @@
case ItemType::PutImageData:
ts << item.get<PutImageData>();
break;
+#if ENABLE(VIDEO)
case ItemType::PaintFrameForMedia:
ts << item.get<PaintFrameForMedia>();
break;
+#endif
case ItemType::StrokeRect:
ts << item.get<StrokeRect>();
break;
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1958,6 +1958,7 @@
return {{ *inputFormat, WTFMove(*imageData), *srcRect, *destPoint, *destFormat }};
}
+#if ENABLE(VIDEO)
class PaintFrameForMedia {
public:
static constexpr ItemType itemType = ItemType::PaintFrameForMedia;
@@ -1980,6 +1981,7 @@
MediaPlayerIdentifier m_identifier;
FloatRect m_destination;
};
+#endif
class StrokeRect {
public:
@@ -2308,7 +2310,9 @@
WebCore::DisplayList::ItemType::MetaCommandChangeDestinationImageBuffer,
WebCore::DisplayList::ItemType::MetaCommandChangeItemBuffer,
WebCore::DisplayList::ItemType::PutImageData,
+#if ENABLE(VIDEO)
WebCore::DisplayList::ItemType::PaintFrameForMedia,
+#endif
WebCore::DisplayList::ItemType::StrokeRect,
WebCore::DisplayList::ItemType::StrokeLine,
#if ENABLE(INLINE_PATH_DATA)
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -444,6 +444,7 @@
append<EndClipToDrawingCommands>(destination);
}
+#if ENABLE(VIDEO)
bool Recorder::canPaintFrameForMedia(const MediaPlayer& player) const
{
return !!player.identifier();
@@ -454,6 +455,7 @@
ASSERT(player.identifier());
append<PaintFrameForMedia>(player, destination);
}
+#endif
void Recorder::applyDeviceScaleFactor(float deviceScaleFactor)
{
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -142,8 +142,10 @@
IntRect clipBounds() override;
void clipToImageBuffer(WebCore::ImageBuffer&, const FloatRect&) override;
void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&&) override;
+#if ENABLE(VIDEO)
void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) override;
bool canPaintFrameForMedia(const MediaPlayer&) const override;
+#endif
void applyDeviceScaleFactor(float) override;
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1081,9 +1081,11 @@
// FIXME: Not implemented.
}
+#if ENABLE(VIDEO)
void CairoOperationRecorder::paintFrameForMedia(MediaPlayer&, const FloatRect&)
{
// FIXME: Not implemented.
}
+#endif
} // namespace Nicosia
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -98,8 +98,10 @@
WebCore::IntRect clipBounds() override;
void clipToImageBuffer(WebCore::ImageBuffer&, const WebCore::FloatRect&) override;
void clipToDrawingCommands(const WebCore::FloatRect& destination, WebCore::DestinationColorSpace, Function<void(WebCore::GraphicsContext&)>&&) override;
+#if ENABLE(VIDEO)
void paintFrameForMedia(WebCore::MediaPlayer&, const WebCore::FloatRect& destination) override;
bool canPaintFrameForMedia(const WebCore::MediaPlayer&) const override { return false; }
+#endif
void applyDeviceScaleFactor(float) override;
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -258,6 +258,7 @@
}
#endif
+#if ENABLE(VIDEO)
bool GraphicsContextGLOpenGL::copyTextureFromMedia(MediaPlayer& player, PlatformGLObject outputTexture, GCGLenum outputTarget, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY)
{
#if USE(AVFOUNDATION)
@@ -276,6 +277,7 @@
return player.copyVideoTextureToPlatformTexture(this, outputTexture, outputTarget, level, internalFormat, format, type, premultiplyAlpha, flipY);
#endif
}
+#endif
} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -466,7 +466,9 @@
RefPtr<ImageData> readRenderingResultsForPainting();
RefPtr<ImageData> readCompositedResultsForPainting();
+#if ENABLE(VIDEO)
bool copyTextureFromMedia(MediaPlayer&, PlatformGLObject texture, GCGLenum target, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY) final;
+#endif
#if USE(OPENGL) && ENABLE(WEBGL2)
void primitiveRestartIndex(GCGLuint);
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -425,10 +425,12 @@
// FIXME: Not implemented.
}
+#if ENABLE(VIDEO)
void GraphicsContextImplDirect2D::paintFrameForMedia(MediaPlayer&, const FloatRect&)
{
// FIXME: Not implemented.
}
+#endif
} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -102,8 +102,10 @@
IntRect clipBounds() override;
void clipToImageBuffer(ImageBuffer&, const FloatRect&) override;
void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&&) override;
+#if ENABLE(VIDEO)
void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) override;
bool canPaintFrameForMedia(const MediaPlayer&) const override { return false; }
+#endif
void applyDeviceScaleFactor(float) override;
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/graphics/SVGImage.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/graphics/SVGImage.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/graphics/SVGImage.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -447,7 +447,9 @@
// SVGImage objects, but we're safe now, because SVGImage can only be
// loaded by a top-level document.
m_page = makeUnique<Page>(WTFMove(pageConfiguration));
+#if ENABLE(VIDEO)
m_page->settings().setMediaEnabled(false);
+#endif
m_page->settings().setScriptEnabled(false);
m_page->settings().setPluginsEnabled(false);
m_page->settings().setAcceleratedCompositingEnabled(false);
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1,3 +1,19 @@
+2021-04-06 Mike Gorse <[email protected]>
+
+ Build fails when video is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=224198
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add #if ENABLE(VIDEO) where needed.
+
+ * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+ (WebKit::RemoteRenderingBackend::decodeItem):
+ * UIProcess/gtk/ClipboardGtk3.cpp:
+ * WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::committedLoad):
+
2021-02-26 Adrian Perez de Castro <[email protected]>
[WPE][GTK] Bogus Response.{status,ok} for successful fetch() requests to a custom URI scheme handler
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -494,7 +494,9 @@
case DisplayList::ItemType::FlushContext:
case DisplayList::ItemType::MetaCommandChangeDestinationImageBuffer:
case DisplayList::ItemType::MetaCommandChangeItemBuffer:
+#if ENABLE(VIDEO)
case DisplayList::ItemType::PaintFrameForMedia:
+#endif
case DisplayList::ItemType::Restore:
case DisplayList::ItemType::Rotate:
case DisplayList::ItemType::Save:
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/gtk/ClipboardGtk3.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/gtk/ClipboardGtk3.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/gtk/ClipboardGtk3.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -35,6 +35,7 @@
#include <WebCore/SharedBuffer.h>
#include <gtk/gtk.h>
#include <wtf/SetForScope.h>
+#include <wtf/glib/GUniquePtr.h>
namespace WebKit {
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2021-04-29 10:24:33 UTC (rev 276763)
@@ -361,7 +361,9 @@
case WebCore::DisplayList::ItemType::FlushContext:
case WebCore::DisplayList::ItemType::MetaCommandChangeDestinationImageBuffer:
case WebCore::DisplayList::ItemType::MetaCommandChangeItemBuffer:
+#if ENABLE(VIDEO)
case WebCore::DisplayList::ItemType::PaintFrameForMedia:
+#endif
case WebCore::DisplayList::ItemType::Restore:
case WebCore::DisplayList::ItemType::Rotate:
case WebCore::DisplayList::ItemType::Save:
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (276762 => 276763)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2021-04-29 09:45:20 UTC (rev 276762)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2021-04-29 10:24:33 UTC (rev 276763)
@@ -1148,8 +1148,10 @@
// If the document is a stand-alone media document, now is the right time to cancel the WebKit load.
// FIXME: This code should be shared across all ports. <http://webkit.org/b/48762>.
+#if ENABLE(VIDEO)
if (is<MediaDocument>(m_frame->coreFrame()->document()))
loader->cancelMainResourceLoad(pluginWillHandleLoadError(loader->response()));
+#endif
// Calling commitData did not create the plug-in view.
if (!m_pluginView)
