Title: [284970] releases/WebKitGTK/webkit-2.34/Source/WebCore
- Revision
- 284970
- Author
- ape...@igalia.com
- Date
- 2021-10-27 23:52:55 -0700 (Wed, 27 Oct 2021)
Log Message
Merge r284858 - 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).
* platform/graphics/BifurcatedGraphicsContext.cpp: Ditto.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog (284969 => 284970)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog 2021-10-28 02:20:47 UTC (rev 284969)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog 2021-10-28 06:52:55 UTC (rev 284970)
@@ -1,3 +1,16 @@
+2021-10-26 Adrian Perez de Castro <ape...@igalia.com>
+
+ 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).
+ * platform/graphics/BifurcatedGraphicsContext.cpp: Ditto.
+
2021-10-15 Michael Catanzaro <mcatanz...@gnome.org>
[WPE][GTK] Update user agent browser versions
Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/accessibility/AXObjectCache.cpp (284969 => 284970)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/accessibility/AXObjectCache.cpp 2021-10-28 02:20:47 UTC (rev 284969)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/accessibility/AXObjectCache.cpp 2021-10-28 06:52:55 UTC (rev 284970)
@@ -528,9 +528,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: releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp (284969 => 284970)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp 2021-10-28 02:20:47 UTC (rev 284969)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp 2021-10-28 06:52:55 UTC (rev 284970)
@@ -269,11 +269,13 @@
m_secondaryContext.drawPattern(nativeImage, imageSize, destRect, tileRect, patternTransform, phase, spacing, options);
}
+#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)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
