Diff
Modified: trunk/ChangeLog (268452 => 268453)
--- trunk/ChangeLog 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/ChangeLog 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,3 +1,22 @@
+2020-10-14 Zan Dobersek <zdober...@igalia.com>
+
+ Remove ACCELERATED_2D_CANVAS build flags and guarded code
+ https://bugs.webkit.org/show_bug.cgi?id=217603
+
+ Reviewed by Carlos Garcia Campos.
+
+ Yank the CMake ENABLE_ACCELERATED_2D_CANVAS option now that it won't
+ have any effect. FindCairoGL.cmake can also be removed.
+
+ * Source/cmake/FindCairoGL.cmake: Removed.
+ * Source/cmake/OptionsFTW.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+ * Source/cmake/OptionsWin.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmake/tools/vsprops/FeatureDefines.props:
+ * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
2020-10-13 Adrian Perez de Castro <ape...@igalia.com>
[GTK] Set ENABLE_GAMEPAD=ON for developer builds
Modified: trunk/Source/WTF/ChangeLog (268452 => 268453)
--- trunk/Source/WTF/ChangeLog 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WTF/ChangeLog 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,3 +1,13 @@
+2020-10-14 Zan Dobersek <zdober...@igalia.com>
+
+ Remove ACCELERATED_2D_CANVAS build flags and guarded code
+ https://bugs.webkit.org/show_bug.cgi?id=217603
+
+ Reviewed by Carlos Garcia Campos.
+
+ * wtf/PlatformEnable.h:
+ Remove the fallback ENABLE_ACCELERATED_2D_CANVAS definition.
+
2020-10-13 Chris Dumez <cdu...@apple.com>
WebAudio tests are crashing in debug when enabling the GPU process
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (268452 => 268453)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -181,10 +181,6 @@
#define ENABLE_ACCESSIBILITY 1
#endif
-#if !defined(ENABLE_ACCELERATED_2D_CANVAS)
-#define ENABLE_ACCELERATED_2D_CANVAS 0
-#endif
-
#if !defined(ENABLE_OVERFLOW_SCROLLING_TOUCH)
#define ENABLE_OVERFLOW_SCROLLING_TOUCH 0
#endif
Modified: trunk/Source/WebCore/ChangeLog (268452 => 268453)
--- trunk/Source/WebCore/ChangeLog 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/ChangeLog 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,3 +1,59 @@
+2020-10-14 Zan Dobersek <zdober...@igalia.com>
+
+ Remove ACCELERATED_2D_CANVAS build flags and guarded code
+ https://bugs.webkit.org/show_bug.cgi?id=217603
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove code guarded by the ACCELERATED_2D_CANVAS build guard, along
+ with related build system cruft. This feature was only implemented for
+ Cairo, and even then was using an experimental GL-oriented backend of
+ Cairo that was not providing necessarily better performance or
+ experience and is not seeing further development.
+
+ * PlatformMac.cmake:
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::createContext2d):
+ (WebCore::HTMLCanvasElement::createContextBitmapRenderer):
+ (WebCore::HTMLCanvasElement::shouldAccelerate const):
+ (WebCore::HTMLCanvasElement::createImageBuffer const):
+ * html/ImageBitmap.cpp:
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ (WebCore::CanvasRenderingContext2DBase::isAccelerated const):
+ (WebCore::CanvasRenderingContext2DBase::drawImage):
+ (WebCore::CanvasRenderingContext2DBase::createPattern):
+ (WebCore::CanvasRenderingContext2DBase::didDraw):
+ (WebCore::CanvasRenderingContext2DBase::platformLayer const): Deleted.
+ * html/canvas/CanvasRenderingContext2DBase.h:
+ * html/canvas/ImageBitmapRenderingContext.cpp:
+ * platform/Cairo.cmake:
+ * platform/SourcesCairo.txt:
+ * platform/graphics/GLContext.h:
+ * platform/graphics/PlatformImageBuffer.h:
+ * platform/graphics/cairo/CairoUtilities.cpp:
+ (WebCore::cairoSurfaceSize):
+ * platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp: Removed.
+ * platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h: Removed.
+ * platform/graphics/egl/GLContextEGL.cpp:
+ (WebCore::GLContextEGL::~GLContextEGL):
+ (WebCore::GLContextEGL::cairoDevice): Deleted.
+ * platform/graphics/egl/GLContextEGL.h:
+ * platform/graphics/glx/GLContextGLX.cpp:
+ (WebCore::GLContextGLX::~GLContextGLX):
+ (WebCore::GLContextGLX::cairoDevice): Deleted.
+ * platform/graphics/glx/GLContextGLX.h:
+ * platform/graphics/gpu/Texture.cpp: Removed.
+ * platform/graphics/gpu/Texture.h: Removed.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::nativeImageForCurrentTime):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::canvasCompositingStrategy):
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ (WebCore::RenderLayerBacking::containsPaintedContent const):
+ (WebCore::RenderLayerBacking::contentChanged):
+
2020-10-14 Kimmo Kinnunen <kkinnu...@apple.com>
REGRESSION: fast/canvas/webgl/context-attributes-alpha.html fails
Modified: trunk/Source/WebCore/PlatformMac.cmake (268452 => 268453)
--- trunk/Source/WebCore/PlatformMac.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/PlatformMac.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -330,7 +330,6 @@
platform/graphics/cv/PixelBufferConformerCV.cpp
platform/graphics/cv/VideoTextureCopierCV.cpp
- platform/graphics/gpu/Texture.cpp
platform/graphics/gpu/TilingData.cpp
platform/graphics/mac/ColorMac.mm
Modified: trunk/Source/WebCore/SourcesCocoa.txt (268452 => 268453)
--- trunk/Source/WebCore/SourcesCocoa.txt 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2020-10-14 12:06:32 UTC (rev 268453)
@@ -378,7 +378,6 @@
platform/graphics/cv/PixelBufferConformerCV.cpp
platform/graphics/cv/VideoTextureCopierCV.cpp
platform/graphics/coreimage/FilterEffectRendererCoreImage.mm
-platform/graphics/gpu/Texture.cpp
platform/graphics/gpu/TilingData.cpp
platform/graphics/gpu/cocoa/GPUBindGroupAllocatorMetal.mm
platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (268452 => 268453)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1274,7 +1274,6 @@
494BD7950F55C8EE00747828 /* WebKitPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 494BD7930F55C8EE00747828 /* WebKitPoint.h */; };
494BD79E0F55C94C00747828 /* JSWebKitPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 494BD79C0F55C94C00747828 /* JSWebKitPoint.h */; };
4969B0F313D0B33F00DF3521 /* HitTestingTransformState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4969B0F113D0B33F00DF3521 /* HitTestingTransformState.h */; };
- 498770F11242C535002226BA /* Texture.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770D81242C535002226BA /* Texture.h */; };
498770F31242C535002226BA /* TilingData.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770DA1242C535002226BA /* TilingData.h */; };
4998AEC613F9D0EA0090B1AA /* RequestAnimationFrameCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4998AEC413F9D0EA0090B1AA /* RequestAnimationFrameCallback.h */; };
4998AECE13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4998AECC13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h */; };
@@ -8064,8 +8063,6 @@
4958782012A57DDF007238AC /* PlatformCALayerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCALayerCocoa.mm; sourceTree = "<group>"; };
4969B0F013D0B33F00DF3521 /* HitTestingTransformState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestingTransformState.cpp; sourceTree = "<group>"; };
4969B0F113D0B33F00DF3521 /* HitTestingTransformState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitTestingTransformState.h; sourceTree = "<group>"; };
- 498770D71242C535002226BA /* Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Texture.cpp; sourceTree = "<group>"; };
- 498770D81242C535002226BA /* Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Texture.h; sourceTree = "<group>"; };
498770D91242C535002226BA /* TilingData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TilingData.cpp; sourceTree = "<group>"; };
498770DA1242C535002226BA /* TilingData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TilingData.h; sourceTree = "<group>"; };
4998AEC413F9D0EA0090B1AA /* RequestAnimationFrameCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RequestAnimationFrameCallback.h; sourceTree = "<group>"; };
@@ -19690,8 +19687,6 @@
D0D8649B21BA1C2D003C983C /* GPUVertexAttributeDescriptor.h */,
D0D8649C21BA1CE8003C983C /* GPUVertexBufferDescriptor.h */,
D0D8649921BA1B1F003C983C /* GPUVertexInputDescriptor.h */,
- 498770D71242C535002226BA /* Texture.cpp */,
- 498770D81242C535002226BA /* Texture.h */,
498770D91242C535002226BA /* TilingData.cpp */,
498770DA1242C535002226BA /* TilingData.h */,
);
@@ -34380,7 +34375,6 @@
1DF7E81F251A9E0600DB8F61 /* TextTrackRepresentation.h in Headers */,
1C73A7132185757E004CCEA5 /* TextUnderlineOffset.h in Headers */,
29FAF4B6195AB08900A522DC /* TextUndoInsertionMarkupMac.h in Headers */,
- 498770F11242C535002226BA /* Texture.h in Headers */,
6FB11B5C21783FD000E2A574 /* TextUtil.h in Headers */,
BCE658FF0EA9248A007E4533 /* Theme.h in Headers */,
310D71961B335C9E009C7B73 /* ThemeCocoa.h in Headers */,
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (268452 => 268453)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -369,7 +369,7 @@
m_context = CanvasRenderingContext2D::create(*this, document().inQuirksMode());
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
// Need to make sure a RenderLayer and compositing layer get created for the Canvas.
invalidateStyleAndLayerComposition();
#endif
@@ -527,7 +527,7 @@
m_context = ImageBitmapRenderingContext::create(*this, WTFMove(settings));
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
// Need to make sure a RenderLayer and compositing layer get created for the Canvas.
invalidateStyleAndLayerComposition();
#endif
@@ -856,17 +856,6 @@
#if USE(IOSURFACE_CANVAS_BACKING_STORE)
return settings.canvasUsesAcceleratedDrawing();
-#elif ENABLE(ACCELERATED_2D_CANVAS)
- if (m_context && !m_context->is2d())
- return false;
-
- if (!settings.accelerated2dCanvasEnabled())
- return false;
-
- if (area < settings.minimumAccelerated2dCanvasSize())
- return false;
-
- return true;
#else
UNUSED_PARAM(size);
return false;
@@ -955,7 +944,7 @@
if (buffer() && buffer()->drawingContext())
buffer()->drawingContext()->setTracksDisplayListReplay(m_tracksDisplayListReplay);
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
if (m_context && m_context->is2d()) {
// Recalculate compositing requirements if acceleration state changed.
const_cast<HTMLCanvasElement*>(this)->invalidateStyleAndLayerComposition();
Modified: trunk/Source/WebCore/html/ImageBitmap.cpp (268452 => 268453)
--- trunk/Source/WebCore/html/ImageBitmap.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/html/ImageBitmap.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -61,7 +61,7 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(ImageBitmap);
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
static RenderingMode bufferRenderingMode = RenderingMode::Accelerated;
#else
static RenderingMode bufferRenderingMode = RenderingMode::Unaccelerated;
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (268452 => 268453)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -145,7 +145,7 @@
bool CanvasRenderingContext2DBase::isAccelerated() const
{
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
auto* context = canvasBase().existingDrawingContext();
return context && context->isAcceleratedContext();
#else
@@ -1585,16 +1585,7 @@
checkOrigin(&sourceCanvas);
-#if ENABLE(ACCELERATED_2D_CANVAS)
- // If we're drawing from one accelerated canvas 2d to another, avoid calling sourceCanvas.makeRenderingResultsAvailable()
- // as that will do a readback to software.
- RefPtr<CanvasRenderingContext> sourceContext = sourceCanvas.renderingContext();
- // FIXME: Implement an accelerated path for drawing from a WebGL canvas to a 2d canvas when possible.
- if (!isAccelerated() || !sourceContext || !sourceContext->isAccelerated() || !sourceContext->is2d())
- sourceCanvas.makeRenderingResultsAvailable();
-#else
sourceCanvas.makeRenderingResultsAvailable();
-#endif
if (rectContainsCanvas(dstRect)) {
c->drawImageBuffer(*buffer, dstRect, srcRect, { state().globalComposite, state().globalBlend });
@@ -1643,7 +1634,7 @@
checkOrigin(&video);
-#if USE(CG) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(GSTREAMER_GL) && USE(CAIRO))
+#if USE(CG)
if (NativeImagePtr image = video.nativeImageForCurrentTime()) {
c->drawNativeImage(image, FloatSize(video.videoWidth(), video.videoHeight()), dstRect, srcRect);
if (rectContainsCanvas(dstRect))
@@ -1949,7 +1940,7 @@
checkOrigin(&videoElement);
bool originClean = canvasBase().originClean();
-#if USE(CG) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(GSTREAMER_GL) && USE(CAIRO))
+#if USE(CG)
if (auto nativeImage = videoElement.nativeImageForCurrentTime())
return RefPtr<CanvasPattern> { CanvasPattern::create(BitmapImage::create(WTFMove(nativeImage)), repeatX, repeatY, originClean) };
#endif
@@ -1993,20 +1984,6 @@
if (!state().hasInvertibleTransform)
return;
-#if ENABLE(ACCELERATED_2D_CANVAS)
- // If we are drawing to hardware and we have a composited layer, just call contentChanged().
- if (isAccelerated() && is<HTMLCanvasElement>(canvasBase())) {
- auto& canvas = downcast<HTMLCanvasElement>(canvasBase());
- RenderBox* renderBox = canvas.renderBox();
- if (renderBox && renderBox->hasAcceleratedCompositing()) {
- renderBox->contentChanged(CanvasPixelsChanged);
- canvas.clearCopiedImage();
- canvas.notifyObserversCanvasChanged(r);
- return;
- }
- }
-#endif
-
FloatRect dirtyRect = r;
if (options & CanvasDidDrawApplyTransform) {
AffineTransform ctm = state().transform;
@@ -2198,18 +2175,6 @@
rect.inflate(delta);
}
-#if ENABLE(ACCELERATED_2D_CANVAS)
-
-PlatformLayer* CanvasRenderingContext2DBase::platformLayer() const
-{
- if (auto* buffer = canvasBase().buffer())
- return buffer->platformLayer();
-
- return nullptr;
-}
-
-#endif
-
static inline InterpolationQuality smoothingToInterpolationQuality(ImageSmoothingQuality quality)
{
switch (quality) {
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h (268452 => 268453)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -369,10 +369,6 @@
bool hasInvertibleTransform() const override { return state().hasInvertibleTransform; }
-#if ENABLE(ACCELERATED_2D_CANVAS)
- PlatformLayer* platformLayer() const override;
-#endif
-
static const unsigned MaxSaveCount = 1024 * 16;
Vector<State, 1> m_stateStack;
unsigned m_unrealizedSaveCount { 0 };
Modified: trunk/Source/WebCore/html/canvas/ImageBitmapRenderingContext.cpp (268452 => 268453)
--- trunk/Source/WebCore/html/canvas/ImageBitmapRenderingContext.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/html/canvas/ImageBitmapRenderingContext.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -35,7 +35,7 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(ImageBitmapRenderingContext);
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
static RenderingMode bufferRenderingMode = RenderingMode::Accelerated;
#else
static RenderingMode bufferRenderingMode = RenderingMode::Unaccelerated;
Modified: trunk/Source/WebCore/platform/Cairo.cmake (268452 => 268453)
--- trunk/Source/WebCore/platform/Cairo.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/Cairo.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -14,7 +14,6 @@
platform/graphics/cairo/CairoUtilities.h
platform/graphics/cairo/GraphicsContextImplCairo.h
platform/graphics/cairo/ImageBufferCairoBackend.h
- platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h
platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.h
platform/graphics/cairo/ImageBufferCairoSurfaceBackend.h
platform/graphics/cairo/PlatformContextCairo.h
Modified: trunk/Source/WebCore/platform/SourcesCairo.txt (268452 => 268453)
--- trunk/Source/WebCore/platform/SourcesCairo.txt 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/SourcesCairo.txt 2020-10-14 12:06:32 UTC (rev 268453)
@@ -31,7 +31,6 @@
platform/graphics/cairo/GraphicsContextCairo.cpp
platform/graphics/cairo/GraphicsContextImplCairo.cpp
platform/graphics/cairo/ImageBufferCairoBackend.cpp
-platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp
platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.cpp
platform/graphics/cairo/ImageBufferCairoSurfaceBackend.cpp
platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
Modified: trunk/Source/WebCore/platform/graphics/GLContext.h (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/GLContext.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/GLContext.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -74,10 +74,6 @@
virtual bool isEGLContext() const = 0;
-#if USE(CAIRO)
- virtual cairo_device_t* cairoDevice() = 0;
-#endif
-
#if ENABLE(GRAPHICS_CONTEXT_GL)
virtual PlatformGraphicsContextGL platformContext() = 0;
#endif
Modified: trunk/Source/WebCore/platform/graphics/PlatformImageBuffer.h (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/PlatformImageBuffer.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/PlatformImageBuffer.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -38,8 +38,6 @@
#if HAVE(IOSURFACE)
#include "ImageBufferIOSurfaceBackend.h"
-#elif USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
-#include "ImageBufferCairoGLSurfaceBackend.h"
#endif
namespace WebCore {
@@ -54,8 +52,6 @@
#if HAVE(IOSURFACE)
using AcceleratedImageBufferBackend = ImageBufferIOSurfaceBackend;
-#elif USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
-using AcceleratedImageBufferBackend = ImageBufferCairoGLSurfaceBackend;
#else
using AcceleratedImageBufferBackend = UnacceleratedImageBufferBackend;
#endif
Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -43,13 +43,6 @@
#include <wtf/UniqueArray.h>
#include <wtf/Vector.h>
-#if ENABLE(ACCELERATED_2D_CANVAS)
-#if USE(EGL) && USE(LIBEPOXY)
-#include "EpoxyEGL.h"
-#endif
-#include <cairo-gl.h>
-#endif
-
#if OS(WINDOWS)
#include <cairo-win32.h>
#endif
@@ -321,10 +314,6 @@
switch (cairo_surface_get_type(surface)) {
case CAIRO_SURFACE_TYPE_IMAGE:
return IntSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
-#if ENABLE(ACCELERATED_2D_CANVAS)
- case CAIRO_SURFACE_TYPE_GL:
- return IntSize(cairo_gl_surface_get_width(surface), cairo_gl_surface_get_height(surface));
-#endif
#if OS(WINDOWS)
case CAIRO_SURFACE_TYPE_WIN32:
surface = cairo_win32_surface_get_image(surface);
Deleted: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2006 Nikolas Zimmermann <zimmerm...@kde.org>
- * Copyright (C) 2007 Holger Hans Peter Freyther <ze...@selfish.org>
- * Copyright (C) 2008, 2009 Dirk Schulze <k...@webkit.org>
- * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ImageBufferCairoGLSurfaceBackend.h"
-
-#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
-
-#include "GLContext.h"
-#include "TextureMapperGL.h"
-#include <wtf/IsoMallocInlines.h>
-
-#if USE(EGL)
-#if USE(LIBEPOXY)
-#include "EpoxyEGL.h"
-#else
-#include <EGL/egl.h>
-#endif
-#endif
-#include <cairo-gl.h>
-
-#if USE(LIBEPOXY)
-#include <epoxy/gl.h>
-#elif USE(OPENGL_ES)
-#include <GLES2/gl2.h>
-#else
-#include "OpenGLShims.h"
-#endif
-
-#if USE(COORDINATED_GRAPHICS)
-#include "TextureMapperPlatformLayerBuffer.h"
-#include "TextureMapperPlatformLayerProxy.h"
-#endif
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(ImageBufferCairoGLSurfaceBackend);
-
-static inline void clearSurface(cairo_surface_t* surface)
-{
- RefPtr<cairo_t> cr = adoptRef(cairo_create(surface));
- cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr.get());
-}
-
-std::unique_ptr<ImageBufferCairoGLSurfaceBackend> ImageBufferCairoGLSurfaceBackend::create(const FloatSize& size, float resolutionScale, ColorSpace colorSpace, const HostWindow*)
-{
- IntSize backendSize = calculateBackendSize(size, resolutionScale);
- if (backendSize.isEmpty())
- return nullptr;
-
- auto* context = PlatformDisplay::sharedDisplayForCompositing().sharingGLContext();
- context->makeContextCurrent();
-
- // We must generate the texture ourselves, because there is no Cairo API for extracting it
- // from a pre-existing surface.
- uint32_t texture;
- glGenTextures(1, &texture);
- glBindTexture(GL_TEXTURE_2D, texture);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
- glTexImage2D(GL_TEXTURE_2D, 0 /* level */, GL_RGBA, backendSize.width(), backendSize.height(), 0 /* border */, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-
- cairo_device_t* device = context->cairoDevice();
-
- // Thread-awareness is a huge performance hit on non-Intel drivers.
- cairo_gl_device_set_thread_aware(device, FALSE);
-
- auto surface = adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, texture, backendSize.width(), backendSize.height()));
- if (cairo_surface_status(surface.get()) != CAIRO_STATUS_SUCCESS)
- return nullptr;
-
- clearSurface(surface.get());
-
- return std::unique_ptr<ImageBufferCairoGLSurfaceBackend>(new ImageBufferCairoGLSurfaceBackend(size, backendSize, resolutionScale, colorSpace, WTFMove(surface), texture));
-}
-
-std::unique_ptr<ImageBufferCairoGLSurfaceBackend> ImageBufferCairoGLSurfaceBackend::create(const FloatSize& size, const GraphicsContext&)
-{
- return ImageBufferCairoGLSurfaceBackend::create(size, 1, ColorSpace::SRGB, nullptr);
-}
-
-ImageBufferCairoGLSurfaceBackend::ImageBufferCairoGLSurfaceBackend(const FloatSize& logicalSize, const IntSize& backendSize, float resolutionScale, ColorSpace colorSpace, RefPtr<cairo_surface_t>&& surface, uint32_t texture)
- : ImageBufferCairoSurfaceBackend(logicalSize, backendSize, resolutionScale, colorSpace, WTFMove(surface))
- , m_texture(texture)
-{
-#if USE(COORDINATED_GRAPHICS)
-#if USE(NICOSIA)
- m_nicosiaLayer = Nicosia::ContentLayer::create(Nicosia::ContentLayerTextureMapperImpl::createFactory(*this));
-#else
- m_platformLayerProxy = adoptRef(new TextureMapperPlatformLayerProxy);
-#endif
-#endif
-}
-
-ImageBufferCairoGLSurfaceBackend::~ImageBufferCairoGLSurfaceBackend()
-{
-#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
- downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).invalidateClient();
-#endif
-
- GLContext* previousActiveContext = GLContext::current();
- PlatformDisplay::sharedDisplayForCompositing().sharingGLContext()->makeContextCurrent();
-
- if (m_texture)
- glDeleteTextures(1, &m_texture);
-
-#if USE(COORDINATED_GRAPHICS)
- if (m_compositorTexture)
- glDeleteTextures(1, &m_compositorTexture);
-#endif
-
- if (previousActiveContext)
- previousActiveContext->makeContextCurrent();
-}
-
-PlatformLayer* ImageBufferCairoGLSurfaceBackend::platformLayer() const
-{
-#if USE(NICOSIA)
- return m_nicosiaLayer.get();
-#else
- if (m_texture)
- return this;
-#endif
- return nullptr;
-}
-
-bool ImageBufferCairoGLSurfaceBackend::copyToPlatformTexture(GraphicsContextGLOpenGL&, GCGLenum target, PlatformGLObject destinationTexture, GCGLenum internalformat, bool premultiplyAlpha, bool flipY) const
-{
- ASSERT_WITH_MESSAGE(m_resolutionScale == 1.0, "Since the HiDPI Canvas feature is removed, the resolution factor here is always 1.");
- if (premultiplyAlpha || flipY)
- return false;
-
- if (!m_texture)
- return false;
-
- GCGLenum bindTextureTarget;
- switch (target) {
- case GL_TEXTURE_2D:
- bindTextureTarget = GL_TEXTURE_2D;
- break;
- case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
- bindTextureTarget = GL_TEXTURE_CUBE_MAP;
- break;
- default:
- return false;
- }
-
- cairo_surface_flush(m_surface.get());
-
- std::unique_ptr<GLContext> context = GLContext::createOffscreenContext(&PlatformDisplay::sharedDisplayForCompositing());
- context->makeContextCurrent();
- uint32_t fbo;
- glGenFramebuffers(1, &fbo);
- glBindFramebuffer(GL_FRAMEBUFFER, fbo);
- glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);
- glBindTexture(bindTextureTarget, destinationTexture);
- glCopyTexImage2D(target, 0, internalformat, 0, 0, m_backendSize.width(), m_backendSize.height(), 0);
- glBindTexture(bindTextureTarget, 0);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
- glFlush();
- glDeleteFramebuffers(1, &fbo);
- return true;
-}
-
-#if USE(COORDINATED_GRAPHICS)
-void ImageBufferCairoGLSurfaceBackend::createCompositorBuffer()
-{
- auto* context = PlatformDisplay::sharedDisplayForCompositing().sharingGLContext();
- context->makeContextCurrent();
-
- glGenTextures(1, &m_compositorTexture);
- glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- glTexImage2D(GL_TEXTURE_2D, 0 , GL_RGBA, m_backendSize.width(), m_backendSize.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-
- m_compositorSurface = adoptRef(cairo_gl_surface_create_for_texture(context->cairoDevice(), CAIRO_CONTENT_COLOR_ALPHA, m_compositorTexture, m_backendSize.width(), m_backendSize.height()));
- m_compositorCr = adoptRef(cairo_create(m_compositorSurface.get()));
- cairo_set_antialias(m_compositorCr.get(), CAIRO_ANTIALIAS_NONE);
-}
-
-void ImageBufferCairoGLSurfaceBackend::swapBuffersIfNeeded()
-{
- GLContext* previousActiveContext = GLContext::current();
-
- if (!m_compositorTexture) {
- createCompositorBuffer();
-
- auto proxyOperation =
- [this](TextureMapperPlatformLayerProxy& proxy)
- {
- LockHolder holder(proxy.lock());
- proxy.pushNextBuffer(makeUnique<TextureMapperPlatformLayerBuffer>(m_compositorTexture, m_backendSize, TextureMapperGL::ShouldBlend, GL_RGBA));
- };
-#if USE(NICOSIA)
- proxyOperation(downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).proxy());
-#else
- proxyOperation(*m_platformLayerProxy);
-#endif
- }
-
- // It would be great if we could just swap the buffers here as we do with webgl, but that breaks the cases
- // where one frame uses the content already rendered in the previous frame. So we just copy the content
- // into the compositor buffer.
- cairo_set_source_surface(m_compositorCr.get(), m_surface.get(), 0, 0);
- cairo_set_operator(m_compositorCr.get(), CAIRO_OPERATOR_SOURCE);
- cairo_paint(m_compositorCr.get());
-
- if (previousActiveContext)
- previousActiveContext->makeContextCurrent();
-}
-#else
-void ImageBufferCairoGLSurfaceBackend::paintToTextureMapper(TextureMapper& textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
-{
- ASSERT(m_texture);
-
- // Cairo may change the active context, so we make sure to change it back after flushing.
- GLContext* previousActiveContext = GLContext::current();
- cairo_surface_flush(m_surface.get());
- previousActiveContext->makeContextCurrent();
-
- static_cast<TextureMapperGL&>(textureMapper).drawTexture(m_texture, TextureMapperGL::ShouldBlend, m_backendSize, targetRect, matrix, opacity);
-}
-#endif
-
-} // namespace WebCore
-
-#endif // USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
Deleted: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2006 Nikolas Zimmermann <zimmerm...@kde.org>
- * Copyright (C) 2007 Holger Hans Peter Freyther <ze...@selfish.org>
- * Copyright (C) 2008, 2009 Dirk Schulze <k...@webkit.org>
- * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
-
-#include "ImageBufferCairoSurfaceBackend.h"
-#include <wtf/IsoMalloc.h>
-
-#if USE(NICOSIA)
-#include "NicosiaContentLayerTextureMapperImpl.h"
-#else
-#include "PlatformLayer.h"
-#endif
-
-namespace WebCore {
-
-class ImageBufferCairoGLSurfaceBackend
-#if USE(NICOSIA)
- : public Nicosia::ContentLayerTextureMapperImpl::Client
-#else
- : public PlatformLayer
-#endif
- , public ImageBufferCairoSurfaceBackend {
- WTF_MAKE_ISO_ALLOCATED(ImageBufferCairoGLSurfaceBackend);
- WTF_MAKE_NONCOPYABLE(ImageBufferCairoGLSurfaceBackend);
-public:
- static std::unique_ptr<ImageBufferCairoGLSurfaceBackend> create(const FloatSize&, float resolutionScale, ColorSpace, const HostWindow*);
- static std::unique_ptr<ImageBufferCairoGLSurfaceBackend> create(const FloatSize&, const GraphicsContext&);
-
- ~ImageBufferCairoGLSurfaceBackend();
-
- PlatformLayer* platformLayer() const override;
- bool copyToPlatformTexture(GraphicsContextGLOpenGL&, GCGLenum target, PlatformGLObject destinationTexture, GCGLenum internalformat, bool premultiplyAlpha, bool flipY) const override;
-
-private:
- ImageBufferCairoGLSurfaceBackend(const FloatSize& logicalSize, const IntSize& backendSize, float resolutionScale, ColorSpace, RefPtr<cairo_surface_t>&&, uint32_t texture);
-
-#if USE(COORDINATED_GRAPHICS)
- void createCompositorBuffer();
- void swapBuffersIfNeeded() override;
-#if !USE(NICOSIA)
- RefPtr<TextureMapperPlatformLayerProxy> proxy() const override { return m_platformLayerProxy.copyRef(); }
-#endif
-#else
- void paintToTextureMapper(TextureMapper&, const FloatRect& target, const TransformationMatrix&, float opacity);
-#endif
-
-#if USE(COORDINATED_GRAPHICS)
-#if USE(NICOSIA)
- RefPtr<Nicosia::ContentLayer> m_nicosiaLayer;
-#else
- RefPtr<TextureMapperPlatformLayerProxy> m_platformLayerProxy;
-#endif
- uint32_t m_texture { 0 };
- RefPtr<cairo_surface_t> m_compositorSurface;
- RefPtr<cairo_t> m_compositorCr;
- uint32_t m_compositorTexture { 0 };
-#endif
-};
-
-} // namespace WebCore
-
-#endif // USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -45,14 +45,6 @@
#include "OpenGLShims.h"
#endif
-#if ENABLE(ACCELERATED_2D_CANVAS)
-// cairo-gl.h includes some definitions from GLX that conflict with
-// the ones provided by us. Since GLContextEGL doesn't use any GLX
-// functions we can safely disable them.
-#undef CAIRO_HAS_GLX_FUNCTIONS
-#include <cairo-gl.h>
-#endif
-
#include <wtf/Vector.h>
namespace WebCore {
@@ -375,11 +367,6 @@
GLContextEGL::~GLContextEGL()
{
-#if USE(CAIRO)
- if (m_cairoDevice)
- cairo_device_destroy(m_cairoDevice);
-#endif
-
EGLDisplay display = m_display.eglDisplay();
if (m_context) {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -504,20 +491,6 @@
eglSwapInterval(m_display.eglDisplay(), interval);
}
-#if USE(CAIRO)
-cairo_device_t* GLContextEGL::cairoDevice()
-{
- if (m_cairoDevice)
- return m_cairoDevice;
-
-#if ENABLE(ACCELERATED_2D_CANVAS)
- m_cairoDevice = cairo_egl_device_create(m_display.eglDisplay(), m_context);
-#endif
-
- return m_cairoDevice;
-}
-#endif
-
#if ENABLE(GRAPHICS_CONTEXT_GL)
PlatformGraphicsContextGL GLContextEGL::platformContext()
{
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -63,9 +63,6 @@
bool canRenderToDefaultFramebuffer() override;
IntSize defaultFrameBufferSize() override;
void swapInterval(int) override;
-#if USE(CAIRO)
- cairo_device_t* cairoDevice() override;
-#endif
bool isEGLContext() const override { return true; }
#if ENABLE(GRAPHICS_CONTEXT_GL)
@@ -118,9 +115,6 @@
#if USE(WPE_RENDERER)
struct wpe_renderer_backend_egl_offscreen_target* m_wpeTarget { nullptr };
#endif
-#if USE(CAIRO)
- cairo_device_t* m_cairoDevice { nullptr };
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -26,10 +26,6 @@
#include <GL/glx.h>
#include <cairo.h>
-#if ENABLE(ACCELERATED_2D_CANVAS)
-#include <cairo-gl.h>
-#endif
-
namespace WebCore {
#if !defined(PFNGLXSWAPINTERVALSGIPROC)
@@ -325,9 +321,6 @@
GLContextGLX::~GLContextGLX()
{
- if (m_cairoDevice)
- cairo_device_destroy(m_cairoDevice);
-
if (m_context) {
// Due to a bug in some nvidia drivers, we need bind the default framebuffer in a context before
// destroying it to avoid a crash. In order to do that, we need to make the context current and,
@@ -401,18 +394,6 @@
glXSwapIntervalSGI(interval);
}
-cairo_device_t* GLContextGLX::cairoDevice()
-{
- if (m_cairoDevice)
- return m_cairoDevice;
-
-#if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS
- m_cairoDevice = cairo_glx_device_create(m_x11Display, m_context.get());
-#endif
-
- return m_cairoDevice;
-}
-
#if ENABLE(GRAPHICS_CONTEXT_GL)
PlatformGraphicsContextGL GLContextGLX::platformContext()
{
Modified: trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -47,7 +47,6 @@
bool canRenderToDefaultFramebuffer() override;
IntSize defaultFrameBufferSize() override;
void swapInterval(int) override;
- cairo_device_t* cairoDevice() override;
bool isEGLContext() const override { return false; }
#if ENABLE(GRAPHICS_CONTEXT_GL)
@@ -68,7 +67,6 @@
XUniqueGLXPbuffer m_pbuffer;
XUniquePixmap m_pixmap;
XUniqueGLXPixmap m_glxPixmap;
- cairo_device_t* m_cairoDevice { nullptr };
};
} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(ACCELERATED_2D_CANVAS)
-
-#include "Texture.h"
-
-#include "ExtensionsGL.h"
-#include "FloatRect.h"
-#include "GraphicsContextGLOpenGL.h"
-#include "IntRect.h"
-#include <algorithm>
-#include <wtf/StdLibExtras.h>
-#include <wtf/UniqueArray.h>
-
-namespace WebCore {
-
-Texture::Texture(GraphicsContextGLOpenGL* context, std::unique_ptr<Vector<unsigned>> tileTextureIds, Format format, int width, int height, int maxTextureSize)
- : m_context(context)
- , m_format(format)
- , m_tiles(IntSize(maxTextureSize, maxTextureSize), IntSize(width, height), true)
- , m_tileTextureIds(WTFMove(tileTextureIds))
-{
-}
-
-Texture::~Texture()
-{
- for (unsigned i = 0; i < m_tileTextureIds->size(); i++)
- m_context->deleteTexture(m_tileTextureIds->at(i));
-}
-
-static void convertFormat(GraphicsContextGLOpenGL* context, Texture::Format format, unsigned* glFormat, unsigned* glType, bool* swizzle)
-{
- *swizzle = false;
- switch (format) {
- case Texture::RGBA8:
- *glFormat = GraphicsContextGL::RGBA;
- *glType = GraphicsContextGL::UNSIGNED_BYTE;
- break;
- case Texture::BGRA8:
- if (context->getExtensions().supports("GL_EXT_texture_format_BGRA8888")) {
- *glFormat = ExtensionsGL::BGRA_EXT;
- *glType = GraphicsContextGL::UNSIGNED_BYTE;
- } else {
- *glFormat = GraphicsContextGL::RGBA;
- *glType = GraphicsContextGL::UNSIGNED_BYTE;
- *swizzle = true;
- }
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
-}
-
-RefPtr<Texture> Texture::create(GraphicsContextGLOpenGL* context, Format format, int width, int height)
-{
- int maxTextureSize = 0;
- context->getIntegerv(GraphicsContextGL::MAX_TEXTURE_SIZE, &maxTextureSize);
- TilingData tiling(IntSize(maxTextureSize, maxTextureSize), IntSize(width, height), true);
-
- // Check for overflow.
- int numTiles = tiling.numTilesX() * tiling.numTilesY();
- if (numTiles / tiling.numTilesX() != tiling.numTilesY()) {
- tiling.setTotalSize(IntSize());
- numTiles = 0;
- }
-
- auto textureIds = makeUnique<Vector<unsigned>>(numTiles);
- textureIds->fill(0, numTiles);
-
- for (int i = 0; i < numTiles; i++) {
- int textureId = context->createTexture();
- if (!textureId) {
- for (int i = 0; i < numTiles; i++)
- context->deleteTexture(textureIds->at(i));
- return nullptr;
- }
- textureIds->at(i) = textureId;
-
- int xIndex = i % tiling.numTilesX();
- int yIndex = i / tiling.numTilesX();
- IntRect tileBoundsWithBorder = tiling.tileBoundsWithBorder(xIndex, yIndex);
-
- unsigned int glFormat = 0;
- unsigned int glType = 0;
- bool swizzle;
- convertFormat(context, format, &glFormat, &glType, &swizzle);
- context->bindTexture(GraphicsContextGL::TEXTURE_2D, textureId);
- context->texImage2DResourceSafe(GraphicsContextGL::TEXTURE_2D, 0, glFormat,
- tileBoundsWithBorder.width(),
- tileBoundsWithBorder.height(),
- 0, glFormat, glType);
- }
- return adoptRef(new Texture(context, WTFMove(textureIds), format, width, height, maxTextureSize));
-}
-
-template <bool swizzle>
-static uint32_t* copySubRect(uint32_t* src, int srcX, int srcY, uint32_t* dst, int width, int height, int srcStride)
-{
- uint32_t* srcOffset = src + srcX + srcY * srcStride;
-
- if (!swizzle && width == srcStride)
- return srcOffset;
-
- if (swizzle) {
- uint32_t* dstPixel = dst;
- for (int y = 0; y < height; ++y) {
- for (int x = 0; x < width ; ++x) {
- uint32_t pixel = srcOffset[x + y * srcStride];
- *dstPixel = (pixel & 0xFF00FF00) | ((pixel & 0x00FF0000) >> 16) | ((pixel & 0x000000FF) << 16);
- dstPixel++;
- }
- }
- } else {
- for (int y = 0; y < height; ++y) {
- memcpy(dst + y * width, srcOffset + y * srcStride, 4 * width);
- }
- }
- return dst;
-}
-
-void Texture::load(void* pixels)
-{
- updateSubRect(pixels, IntRect(0, 0, m_tiles.totalSize().width(), m_tiles.totalSize().height()));
-}
-
-void Texture::updateSubRect(void* pixels, const IntRect& updateRect)
-{
- IntRect updateRectSanitized(updateRect);
- updateRectSanitized.intersect(IntRect(0, 0, m_tiles.totalSize().width(), m_tiles.totalSize().height()));
-
- uint32_t* pixels32 = static_cast<uint32_t*>(pixels);
- unsigned int glFormat = 0;
- unsigned int glType = 0;
- bool swizzle;
- convertFormat(m_context, m_format, &glFormat, &glType, &swizzle);
- if (swizzle) {
- ASSERT(glFormat == GraphicsContextGL::RGBA && glType == GraphicsContextGL::UNSIGNED_BYTE);
- // FIXME: This could use PBO's to save doing an extra copy here.
- }
- int tempBuffSize = // Temporary buffer size is the smaller of the max texture size or the updateRectSanitized
- std::min(m_tiles.maxTextureSize().width(), m_tiles.borderTexels() + updateRectSanitized.width()) *
- std::min(m_tiles.maxTextureSize().height(), m_tiles.borderTexels() + updateRectSanitized.height());
- auto tempBuff = makeUniqueArray<uint32_t>(tempBuffSize);
-
- for (int tile = 0; tile < m_tiles.numTilesX() * m_tiles.numTilesY(); tile++) {
- int xIndex = tile % m_tiles.numTilesX();
- int yIndex = tile / m_tiles.numTilesX();
-
- // Intersect with tile
- IntRect tileBoundsWithBorder = m_tiles.tileBoundsWithBorder(xIndex, yIndex);
-
- IntRect updateRectIntersected = updateRectSanitized;
- updateRectIntersected.intersect(tileBoundsWithBorder);
-
- IntRect dstRect = updateRectIntersected;
- dstRect.moveBy(-tileBoundsWithBorder.location());
-
- if (updateRectIntersected.isEmpty())
- continue;
-
- // Copy sub rectangle out of larger pixel data
- uint32_t* uploadBuff = 0;
- if (swizzle) {
- uploadBuff = copySubRect<true>(
- pixels32, updateRectIntersected.x(), updateRectIntersected.y(),
- tempBuff.get(), updateRectIntersected.width(), updateRectIntersected.height(), m_tiles.totalSize().width());
- } else {
- uploadBuff = copySubRect<false>(
- pixels32, updateRectIntersected.x(), updateRectIntersected.y(),
- tempBuff.get(), updateRectIntersected.width(), updateRectIntersected.height(), m_tiles.totalSize().width());
- }
-
- m_context->bindTexture(GraphicsContextGL::TEXTURE_2D, m_tileTextureIds->at(tile));
- m_context->texSubImage2D(GraphicsContextGL::TEXTURE_2D, 0 /* level */,
- dstRect.x(),
- dstRect.y(),
- updateRectIntersected.width(),
- updateRectIntersected.height(), glFormat, glType, uploadBuff);
- }
-}
-
-void Texture::bindTile(int tile)
-{
- m_context->bindTexture(GraphicsContextGL::TEXTURE_2D, m_tileTextureIds->at(tile));
- m_context->texParameteri(GraphicsContextGL::TEXTURE_2D, GraphicsContextGL::TEXTURE_MIN_FILTER, GraphicsContextGL::LINEAR);
- m_context->texParameteri(GraphicsContextGL::TEXTURE_2D, GraphicsContextGL::TEXTURE_MAG_FILTER, GraphicsContextGL::LINEAR);
- m_context->texParameteri(GraphicsContextGL::TEXTURE_2D, GraphicsContextGL::TEXTURE_WRAP_S, GraphicsContextGL::CLAMP_TO_EDGE);
- m_context->texParameteri(GraphicsContextGL::TEXTURE_2D, GraphicsContextGL::TEXTURE_WRAP_T, GraphicsContextGL::CLAMP_TO_EDGE);
-}
-
-}
-
-#endif
Deleted: trunk/Source/WebCore/platform/graphics/gpu/Texture.h (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/gpu/Texture.h 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/gpu/Texture.h 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef Texture_h
-#define Texture_h
-
-#include "TilingData.h"
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-class GraphicsContextGLOpenGL;
-
-class IntRect;
-
-class Texture : public RefCounted<Texture> {
-public:
- ~Texture();
- enum Format { RGBA8, BGRA8 };
- static RefPtr<Texture> create(GraphicsContextGLOpenGL*, Format, int width, int height);
- void bindTile(int tile);
- void load(void* pixels);
- void updateSubRect(void* pixels, const IntRect&);
- Format format() const { return m_format; }
- const TilingData& tiles() const { return m_tiles; }
-private:
- Texture(GraphicsContextGLOpenGL*, std::unique_ptr<Vector<unsigned>> tileTextureIds, Format, int width, int height, int maxTextureSize);
- GraphicsContextGLOpenGL* m_context;
- Format m_format;
- TilingData m_tiles;
- std::unique_ptr<Vector<unsigned>> m_tileTextureIds;
-};
-
-}
-
-#endif // Texture_h
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (268452 => 268453)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -129,13 +129,6 @@
#include "TextureMapperContextAttributes.h"
#include "TextureMapperPlatformLayerBuffer.h"
#include "TextureMapperPlatformLayerProxy.h"
-#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
-#include <cairo-gl.h>
-#include "GLContext.h"
-#include "PlatformDisplay.h"
-// cairo-gl.h ends up including X.h, which defines None, breaking MediaPlayer:: enums.
-#undef None
-#endif
#endif // USE(TEXTURE_MAPPER_GL)
#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
@@ -3218,40 +3211,7 @@
NativeImagePtr MediaPlayerPrivateGStreamer::nativeImageForCurrentTime()
{
-#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
- if (m_isUsingFallbackVideoSink)
- return nullptr;
-
- auto sampleLocker = holdLock(m_sampleMutex);
-
- if (!GST_IS_SAMPLE(m_sample.get()))
- return nullptr;
-
- std::unique_ptr<GstVideoFrameHolder> frameHolder = makeUnique<GstVideoFrameHolder>(m_sample.get(), m_videoDecoderPlatform, m_textureMapperFlags, true);
-
- std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer = frameHolder->platformLayerBuffer();
- if (!layerBuffer)
- return nullptr;
-
- auto size = frameHolder->size();
- if (m_videoSourceOrientation.usesWidthAsHeight())
- size = size.transposedSize();
-
- GLContext* context = PlatformDisplay::sharedDisplayForCompositing().sharingGLContext();
- context->makeContextCurrent();
-
- if (!m_videoTextureCopier)
- m_videoTextureCopier = makeUnique<VideoTextureCopierGStreamer>(TEXTURE_COPIER_COLOR_CONVERT_FLAG);
-
- frameHolder->waitForCPUSync();
-
- if (!m_videoTextureCopier->copyVideoTextureToPlatformTexture(*layerBuffer.get(), size, 0, GL_TEXTURE_2D, 0, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, false, m_videoSourceOrientation))
- return nullptr;
-
- return adoptRef(cairo_gl_surface_create_for_texture(context->cairoDevice(), CAIRO_CONTENT_COLOR_ALPHA, m_videoTextureCopier->resultTexture(), size.width(), size.height()));
-#else
return nullptr;
-#endif
}
#endif // USE(GSTREAMER_GL)
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (268452 => 268453)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2020-10-14 12:06:32 UTC (rev 268453)
@@ -94,11 +94,7 @@
if (context->isGPUBased())
return CanvasAsLayerContents;
-#if ENABLE(ACCELERATED_2D_CANVAS)
- return CanvasAsLayerContents;
-#else
return CanvasPaintedToLayer; // On Mac and iOS we paint accelerated canvases into their layers.
-#endif
}
// This acts as a cache of what we know about what is painting into this RenderLayerBacking.
@@ -1058,7 +1054,7 @@
updateContentsRects();
}
#endif
-#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
+#if ENABLE(WEBGL) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
else if (renderer().isCanvas() && canvasCompositingStrategy(renderer()) == CanvasAsLayerContents) {
const HTMLCanvasElement* canvas = downcast<HTMLCanvasElement>(renderer().element());
if (auto* context = canvas->renderingContext())
@@ -2773,7 +2769,7 @@
return m_owningLayer.hasVisibleBoxDecorationsOrBackground() || (!(downcast<RenderVideo>(renderer()).supportsAcceleratedRendering()) && m_requiresOwnBackingStore);
#endif
-#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(OFFSCREEN_CANVAS)
+#if ENABLE(WEBGL) || ENABLE(OFFSCREEN_CANVAS)
if (is<RenderHTMLCanvas>(renderer()) && canvasCompositingStrategy(renderer()) == CanvasAsLayerContents)
return m_owningLayer.hasVisibleBoxDecorationsOrBackground();
#endif
@@ -2838,7 +2834,7 @@
if ((changeType == MaskImageChanged) && m_maskLayer)
m_owningLayer.setNeedsCompositingConfigurationUpdate();
-#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
+#if ENABLE(WEBGL) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
if ((changeType == CanvasChanged || changeType == CanvasPixelsChanged) && renderer().isCanvas() && canvasCompositingStrategy(renderer()) == CanvasAsLayerContents) {
if (changeType == CanvasChanged)
compositor().scheduleCompositingLayerUpdate();
Deleted: trunk/Source/cmake/FindCairoGL.cmake (268452 => 268453)
--- trunk/Source/cmake/FindCairoGL.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/FindCairoGL.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,51 +0,0 @@
-# - Try to find CairoGL
-# Once done, this will define
-#
-# CAIROGL_FOUND - system has CairoGL
-# CAIROGL_INCLUDE_DIRS - the CairoGL include directories
-# CAIROGL_LIBRARIES - link these to use CairoGL
-#
-# Copyright (C) 2014 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(CAIROGL cairo-gl)
-
-if (CAIROGL_FOUND)
-# At the moment CairoGL does not add any extra cflags and libraries, so we can
-# safely ignore CAIROGL_LIBRARIES and CAIROGL_INCLUDE_DIRS for the moment.
-foreach (_component ${CairoGL_FIND_COMPONENTS})
- string(TOUPPER ${_component} _UPPER_NAME)
- string(REGEX REPLACE "-" "_" _UPPER_NAME ${_UPPER_NAME})
- pkg_check_modules(${_UPPER_NAME} ${_component})
- if (${_UPPER_NAME}_INCLUDE_DIRS)
- set(CAIROGL_INCLUDE_DIRS ${CAIROGL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
- endif ()
- if (${_UPPER_NAME}_LIBRARIES)
- set(CAIROGL_LIBRARIES ${CAIROGL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
- endif ()
-endforeach ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES)
-endif ()
Modified: trunk/Source/cmake/OptionsFTW.cmake (268452 => 268453)
--- trunk/Source/cmake/OptionsFTW.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/OptionsFTW.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -130,7 +130,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE OFF)
# Off for now, but should be on
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE OFF)
Modified: trunk/Source/cmake/OptionsGTK.cmake (268452 => 268453)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -105,11 +105,7 @@
# completely unsupported. They are intended for use only by WebKit developers.
WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
-# FIXME: Can we use cairo-glesv2 to avoid this conflict?
-WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
-
WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_GRAPHICS_CONTEXT_GL)
-WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GRAPHICS_CONTEXT_GL)
WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_GRAPHICS_CONTEXT_GL)
WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_GRAPHICS_CONTEXT_GL)
WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_GRAPHICS_CONTEXT_GL)
@@ -151,7 +147,6 @@
# Public options shared with other WebKit ports. Do not add any options here
# without approval from a GTK reviewer. There must be strong reason to support
# changing the value of the option.
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
@@ -244,20 +239,6 @@
find_package(LibXslt 1.1.7 REQUIRED)
endif ()
-if (ENABLE_ACCELERATED_2D_CANVAS)
- if (GLX_FOUND)
- list(APPEND CAIROGL_COMPONENTS cairo-glx)
- endif ()
- if (EGL_FOUND)
- list(APPEND CAIROGL_COMPONENTS cairo-egl)
- endif ()
-
- find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
- if (NOT CAIROGL_FOUND)
- message(FATAL_ERROR "CairoGL is needed for ENABLE_ACCELERATED_2D_CANVAS")
- endif ()
-endif ()
-
if (USE_LIBSECRET)
find_package(Libsecret)
if (NOT LIBSECRET_FOUND)
Modified: trunk/Source/cmake/OptionsWPE.cmake (268452 => 268453)
--- trunk/Source/cmake/OptionsWPE.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/OptionsWPE.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -44,7 +44,6 @@
# Public options shared with other WebKit ports. Do not add any options here
# without approval from a WPE reviewer. There must be strong reason to support
# changing the value of the option.
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE OFF)
@@ -152,10 +151,6 @@
endif ()
endif ()
-if (ENABLE_ACCELERATED_2D_CANVAS)
- find_package(CairoGL 1.10.2 REQUIRED COMPONENTS cairo-egl)
-endif ()
-
if (ENABLE_WEB_CRYPTO)
find_package(Libtasn1 REQUIRED)
if (NOT LIBTASN1_FOUND)
Modified: trunk/Source/cmake/OptionsWin.cmake (268452 => 268453)
--- trunk/Source/cmake/OptionsWin.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/OptionsWin.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -18,7 +18,6 @@
# FIXME: Most of these options should not be public.
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PUBLIC ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (268452 => 268453)
--- trunk/Source/cmake/WebKitFeatures.cmake 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2020-10-14 12:06:32 UTC (rev 268453)
@@ -96,7 +96,6 @@
endif ()
WEBKIT_OPTION_DEFINE(ENABLE_3D_TRANSFORMS "Toggle 3D transforms support" PRIVATE ON)
- WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle Accelerated 2D Canvas support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CORE_IMAGE_ACCELERATED_FILTER_RENDER "Toggle Accelerated CSS/SVG Filter Rendering using CoreImage" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Whether to enable support for accessibility" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY_ISOLATED_TREE "Toggle accessibility isolated tree support" PRIVATE OFF)
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (268452 => 268453)
--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2020-10-14 12:06:32 UTC (rev 268453)
@@ -2,7 +2,6 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<ENABLE_3D_TRANSFORMS>ENABLE_3D_TRANSFORMS</ENABLE_3D_TRANSFORMS>
- <ENABLE_ACCELERATED_2D_CANVAS />
<ENABLE_OVERFLOW_SCROLLING_TOUCH />
<ENABLE_ATTACHMENT_ELEMENT>ENABLE_ATTACHMENT_ELEMENT</ENABLE_ATTACHMENT_ELEMENT>
<ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
@@ -69,7 +68,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPU
T_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_
WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -77,10 +76,6 @@
<Value>$(ENABLE_3D_TRANSFORMS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_ACCELERATED_2D_CANVAS">
- <Value>$(ENABLE_ACCELERATED_2D_CANVAS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_OVERFLOW_SCROLLING_TOUCH">
<Value>$(ENABLE_OVERFLOW_SCROLLING_TOUCH)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (268452 => 268453)
--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2020-10-14 12:06:32 UTC (rev 268453)
@@ -2,7 +2,6 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<ENABLE_3D_TRANSFORMS>ENABLE_3D_TRANSFORMS</ENABLE_3D_TRANSFORMS>
- <ENABLE_ACCELERATED_2D_CANVAS />
<ENABLE_OVERFLOW_SCROLLING_TOUCH />
<ENABLE_ATTACHMENT_ELEMENT>ENABLE_ATTACHMENT_ELEMENT</ENABLE_ATTACHMENT_ELEMENT>
<ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
@@ -69,7 +68,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPU
T_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_
WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -77,10 +76,6 @@
<Value>$(ENABLE_3D_TRANSFORMS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_ACCELERATED_2D_CANVAS">
- <Value>$(ENABLE_ACCELERATED_2D_CANVAS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_OVERFLOW_SCROLLING_TOUCH">
<Value>$(ENABLE_OVERFLOW_SCROLLING_TOUCH)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Tools/ChangeLog (268452 => 268453)
--- trunk/Tools/ChangeLog 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Tools/ChangeLog 2020-10-14 12:06:32 UTC (rev 268453)
@@ -1,3 +1,13 @@
+2020-10-14 Zan Dobersek <zdober...@igalia.com>
+
+ Remove ACCELERATED_2D_CANVAS build flags and guarded code
+ https://bugs.webkit.org/show_bug.cgi?id=217603
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Scripts/webkitperl/FeatureList.pm:
+ Remove the ACCELERATED_2D_CANVAS feature flag.
+
2020-10-14 Diego Pino Garcia <dp...@igalia.com>
[webkitpy] Allow passing subtests to GLIB API testrunner
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (268452 => 268453)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-10-14 11:58:55 UTC (rev 268452)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-10-14 12:06:32 UTC (rev 268453)
@@ -49,7 +49,6 @@
}
my (
- $accelerated2DCanvasSupport,
$accessibilityIsolatedTreeSupport,
$applePaySessionV3Support,
$applePaySessionV4Support,
@@ -197,9 +196,6 @@
{ option => "3d-rendering", desc => "Toggle 3D rendering support",
define => "ENABLE_3D_TRANSFORMS", value => \$threeDTransformsSupport },
- { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
- define => "ENABLE_ACCELERATED_2D_CANVAS", value => \$accelerated2DCanvasSupport },
-
{ option => "accessibility-isolated-tree", desc => "Toggle accessibility isolated tree support",
define => "ENABLE_ACCESSIBILITY_ISOLATED_TREE", value => \$accessibilityIsolatedTreeSupport },
