Changeset 268453 in webkit


Ignore:
Timestamp:
Oct 14, 2020 5:06:32 AM (3 years ago)
Author:
zandobersek@gmail.com
Message:

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:

Source/WebCore:

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):

Source/WTF:

  • wtf/PlatformEnable.h:

Remove the fallback ENABLE_ACCELERATED_2D_CANVAS definition.

Tools:

  • Scripts/webkitperl/FeatureList.pm:

Remove the ACCELERATED_2D_CANVAS feature flag.

Location:
trunk
Files:
5 deleted
32 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r268389 r268453  
     12020-10-14  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove ACCELERATED_2D_CANVAS build flags and guarded code
     4        https://bugs.webkit.org/show_bug.cgi?id=217603
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Yank the CMake ENABLE_ACCELERATED_2D_CANVAS option now that it won't
     9        have any effect. FindCairoGL.cmake can also be removed.
     10
     11        * Source/cmake/FindCairoGL.cmake: Removed.
     12        * Source/cmake/OptionsFTW.cmake:
     13        * Source/cmake/OptionsGTK.cmake:
     14        * Source/cmake/OptionsWPE.cmake:
     15        * Source/cmake/OptionsWin.cmake:
     16        * Source/cmake/WebKitFeatures.cmake:
     17        * Source/cmake/tools/vsprops/FeatureDefines.props:
     18        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
     19
    1202020-10-13  Adrian Perez de Castro  <aperez@igalia.com>
    221
  • trunk/Source/WTF/ChangeLog

    r268423 r268453  
     12020-10-14  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove ACCELERATED_2D_CANVAS build flags and guarded code
     4        https://bugs.webkit.org/show_bug.cgi?id=217603
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * wtf/PlatformEnable.h:
     9        Remove the fallback ENABLE_ACCELERATED_2D_CANVAS definition.
     10
    1112020-10-13  Chris Dumez  <cdumez@apple.com>
    212
  • trunk/Source/WTF/wtf/PlatformEnable.h

    r268239 r268453  
    182182#endif
    183183
    184 #if !defined(ENABLE_ACCELERATED_2D_CANVAS)
    185 #define ENABLE_ACCELERATED_2D_CANVAS 0
    186 #endif
    187 
    188184#if !defined(ENABLE_OVERFLOW_SCROLLING_TOUCH)
    189185#define ENABLE_OVERFLOW_SCROLLING_TOUCH 0
  • trunk/Source/WebCore/ChangeLog

    r268446 r268453  
     12020-10-14  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove ACCELERATED_2D_CANVAS build flags and guarded code
     4        https://bugs.webkit.org/show_bug.cgi?id=217603
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Remove code guarded by the ACCELERATED_2D_CANVAS build guard, along
     9        with related build system cruft. This feature was only implemented for
     10        Cairo, and even then was using an experimental GL-oriented backend of
     11        Cairo that was not providing necessarily better performance or
     12        experience and is not seeing further development.
     13
     14        * PlatformMac.cmake:
     15        * SourcesCocoa.txt:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * html/HTMLCanvasElement.cpp:
     18        (WebCore::HTMLCanvasElement::createContext2d):
     19        (WebCore::HTMLCanvasElement::createContextBitmapRenderer):
     20        (WebCore::HTMLCanvasElement::shouldAccelerate const):
     21        (WebCore::HTMLCanvasElement::createImageBuffer const):
     22        * html/ImageBitmap.cpp:
     23        * html/canvas/CanvasRenderingContext2DBase.cpp:
     24        (WebCore::CanvasRenderingContext2DBase::isAccelerated const):
     25        (WebCore::CanvasRenderingContext2DBase::drawImage):
     26        (WebCore::CanvasRenderingContext2DBase::createPattern):
     27        (WebCore::CanvasRenderingContext2DBase::didDraw):
     28        (WebCore::CanvasRenderingContext2DBase::platformLayer const): Deleted.
     29        * html/canvas/CanvasRenderingContext2DBase.h:
     30        * html/canvas/ImageBitmapRenderingContext.cpp:
     31        * platform/Cairo.cmake:
     32        * platform/SourcesCairo.txt:
     33        * platform/graphics/GLContext.h:
     34        * platform/graphics/PlatformImageBuffer.h:
     35        * platform/graphics/cairo/CairoUtilities.cpp:
     36        (WebCore::cairoSurfaceSize):
     37        * platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp: Removed.
     38        * platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h: Removed.
     39        * platform/graphics/egl/GLContextEGL.cpp:
     40        (WebCore::GLContextEGL::~GLContextEGL):
     41        (WebCore::GLContextEGL::cairoDevice): Deleted.
     42        * platform/graphics/egl/GLContextEGL.h:
     43        * platform/graphics/glx/GLContextGLX.cpp:
     44        (WebCore::GLContextGLX::~GLContextGLX):
     45        (WebCore::GLContextGLX::cairoDevice): Deleted.
     46        * platform/graphics/glx/GLContextGLX.h:
     47        * platform/graphics/gpu/Texture.cpp: Removed.
     48        * platform/graphics/gpu/Texture.h: Removed.
     49        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
     50        (WebCore::MediaPlayerPrivateGStreamer::nativeImageForCurrentTime):
     51        * rendering/RenderLayerBacking.cpp:
     52        (WebCore::canvasCompositingStrategy):
     53        (WebCore::RenderLayerBacking::updateConfiguration):
     54        (WebCore::RenderLayerBacking::containsPaintedContent const):
     55        (WebCore::RenderLayerBacking::contentChanged):
     56
    1572020-10-14  Kimmo Kinnunen  <kkinnunen@apple.com>
    258
  • trunk/Source/WebCore/PlatformMac.cmake

    r268198 r268453  
    331331    platform/graphics/cv/VideoTextureCopierCV.cpp
    332332
    333     platform/graphics/gpu/Texture.cpp
    334333    platform/graphics/gpu/TilingData.cpp
    335334
  • trunk/Source/WebCore/SourcesCocoa.txt

    r268288 r268453  
    379379platform/graphics/cv/VideoTextureCopierCV.cpp
    380380platform/graphics/coreimage/FilterEffectRendererCoreImage.mm
    381 platform/graphics/gpu/Texture.cpp
    382381platform/graphics/gpu/TilingData.cpp
    383382platform/graphics/gpu/cocoa/GPUBindGroupAllocatorMetal.mm
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r268423 r268453  
    12751275                494BD79E0F55C94C00747828 /* JSWebKitPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 494BD79C0F55C94C00747828 /* JSWebKitPoint.h */; };
    12761276                4969B0F313D0B33F00DF3521 /* HitTestingTransformState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4969B0F113D0B33F00DF3521 /* HitTestingTransformState.h */; };
    1277                 498770F11242C535002226BA /* Texture.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770D81242C535002226BA /* Texture.h */; };
    12781277                498770F31242C535002226BA /* TilingData.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770DA1242C535002226BA /* TilingData.h */; };
    12791278                4998AEC613F9D0EA0090B1AA /* RequestAnimationFrameCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4998AEC413F9D0EA0090B1AA /* RequestAnimationFrameCallback.h */; };
     
    80658064                4969B0F013D0B33F00DF3521 /* HitTestingTransformState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestingTransformState.cpp; sourceTree = "<group>"; };
    80668065                4969B0F113D0B33F00DF3521 /* HitTestingTransformState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitTestingTransformState.h; sourceTree = "<group>"; };
    8067                 498770D71242C535002226BA /* Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Texture.cpp; sourceTree = "<group>"; };
    8068                 498770D81242C535002226BA /* Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Texture.h; sourceTree = "<group>"; };
    80698066                498770D91242C535002226BA /* TilingData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TilingData.cpp; sourceTree = "<group>"; };
    80708067                498770DA1242C535002226BA /* TilingData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TilingData.h; sourceTree = "<group>"; };
     
    1969119688                                D0D8649C21BA1CE8003C983C /* GPUVertexBufferDescriptor.h */,
    1969219689                                D0D8649921BA1B1F003C983C /* GPUVertexInputDescriptor.h */,
    19693                                 498770D71242C535002226BA /* Texture.cpp */,
    19694                                 498770D81242C535002226BA /* Texture.h */,
    1969519690                                498770D91242C535002226BA /* TilingData.cpp */,
    1969619691                                498770DA1242C535002226BA /* TilingData.h */,
     
    3438134376                                1C73A7132185757E004CCEA5 /* TextUnderlineOffset.h in Headers */,
    3438234377                                29FAF4B6195AB08900A522DC /* TextUndoInsertionMarkupMac.h in Headers */,
    34383                                 498770F11242C535002226BA /* Texture.h in Headers */,
    3438434378                                6FB11B5C21783FD000E2A574 /* TextUtil.h in Headers */,
    3438534379                                BCE658FF0EA9248A007E4533 /* Theme.h in Headers */,
  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r268255 r268453  
    370370    m_context = CanvasRenderingContext2D::create(*this, document().inQuirksMode());
    371371
    372 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     372#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    373373    // Need to make sure a RenderLayer and compositing layer get created for the Canvas.
    374374    invalidateStyleAndLayerComposition();
     
    528528    m_context = ImageBitmapRenderingContext::create(*this, WTFMove(settings));
    529529
    530 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     530#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    531531    // Need to make sure a RenderLayer and compositing layer get created for the Canvas.
    532532    invalidateStyleAndLayerComposition();
     
    857857#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    858858    return settings.canvasUsesAcceleratedDrawing();
    859 #elif ENABLE(ACCELERATED_2D_CANVAS)
    860     if (m_context && !m_context->is2d())
    861         return false;
    862 
    863     if (!settings.accelerated2dCanvasEnabled())
    864         return false;
    865 
    866     if (area < settings.minimumAccelerated2dCanvasSize())
    867         return false;
    868 
    869     return true;
    870859#else
    871860    UNUSED_PARAM(size);
     
    956945        buffer()->drawingContext()->setTracksDisplayListReplay(m_tracksDisplayListReplay);
    957946
    958 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     947#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    959948    if (m_context && m_context->is2d()) {
    960949        // Recalculate compositing requirements if acceleration state changed.
  • trunk/Source/WebCore/html/ImageBitmap.cpp

    r268299 r268453  
    6262WTF_MAKE_ISO_ALLOCATED_IMPL(ImageBitmap);
    6363
    64 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     64#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    6565static RenderingMode bufferRenderingMode = RenderingMode::Accelerated;
    6666#else
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp

    r268299 r268453  
    146146bool CanvasRenderingContext2DBase::isAccelerated() const
    147147{
    148 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     148#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    149149    auto* context = canvasBase().existingDrawingContext();
    150150    return context && context->isAcceleratedContext();
     
    15861586    checkOrigin(&sourceCanvas);
    15871587
    1588 #if ENABLE(ACCELERATED_2D_CANVAS)
    1589     // If we're drawing from one accelerated canvas 2d to another, avoid calling sourceCanvas.makeRenderingResultsAvailable()
    1590     // as that will do a readback to software.
    1591     RefPtr<CanvasRenderingContext> sourceContext = sourceCanvas.renderingContext();
    1592     // FIXME: Implement an accelerated path for drawing from a WebGL canvas to a 2d canvas when possible.
    1593     if (!isAccelerated() || !sourceContext || !sourceContext->isAccelerated() || !sourceContext->is2d())
    1594         sourceCanvas.makeRenderingResultsAvailable();
    1595 #else
    15961588    sourceCanvas.makeRenderingResultsAvailable();
    1597 #endif
    15981589
    15991590    if (rectContainsCanvas(dstRect)) {
     
    16441635    checkOrigin(&video);
    16451636
    1646 #if USE(CG) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(GSTREAMER_GL) && USE(CAIRO))
     1637#if USE(CG)
    16471638    if (NativeImagePtr image = video.nativeImageForCurrentTime()) {
    16481639        c->drawNativeImage(image, FloatSize(video.videoWidth(), video.videoHeight()), dstRect, srcRect);
     
    19501941    bool originClean = canvasBase().originClean();
    19511942
    1952 #if USE(CG) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(GSTREAMER_GL) && USE(CAIRO))
     1943#if USE(CG)
    19531944    if (auto nativeImage = videoElement.nativeImageForCurrentTime())
    19541945        return RefPtr<CanvasPattern> { CanvasPattern::create(BitmapImage::create(WTFMove(nativeImage)), repeatX, repeatY, originClean) };
     
    19931984    if (!state().hasInvertibleTransform)
    19941985        return;
    1995 
    1996 #if ENABLE(ACCELERATED_2D_CANVAS)
    1997     // If we are drawing to hardware and we have a composited layer, just call contentChanged().
    1998     if (isAccelerated() && is<HTMLCanvasElement>(canvasBase())) {
    1999         auto& canvas = downcast<HTMLCanvasElement>(canvasBase());
    2000         RenderBox* renderBox = canvas.renderBox();
    2001         if (renderBox && renderBox->hasAcceleratedCompositing()) {
    2002             renderBox->contentChanged(CanvasPixelsChanged);
    2003             canvas.clearCopiedImage();
    2004             canvas.notifyObserversCanvasChanged(r);
    2005             return;
    2006         }
    2007     }
    2008 #endif
    20091986
    20101987    FloatRect dirtyRect = r;
     
    21992176}
    22002177
    2201 #if ENABLE(ACCELERATED_2D_CANVAS)
    2202 
    2203 PlatformLayer* CanvasRenderingContext2DBase::platformLayer() const
    2204 {
    2205     if (auto* buffer = canvasBase().buffer())
    2206         return buffer->platformLayer();
    2207 
    2208     return nullptr;
    2209 }
    2210 
    2211 #endif
    2212 
    22132178static inline InterpolationQuality smoothingToInterpolationQuality(ImageSmoothingQuality quality)
    22142179{
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h

    r259567 r268453  
    370370    bool hasInvertibleTransform() const override { return state().hasInvertibleTransform; }
    371371
    372 #if ENABLE(ACCELERATED_2D_CANVAS)
    373     PlatformLayer* platformLayer() const override;
    374 #endif
    375 
    376372    static const unsigned MaxSaveCount = 1024 * 16;
    377373    Vector<State, 1> m_stateStack;
  • trunk/Source/WebCore/html/canvas/ImageBitmapRenderingContext.cpp

    r267615 r268453  
    3636WTF_MAKE_ISO_ALLOCATED_IMPL(ImageBitmapRenderingContext);
    3737
    38 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     38#if USE(IOSURFACE_CANVAS_BACKING_STORE)
    3939static RenderingMode bufferRenderingMode = RenderingMode::Accelerated;
    4040#else
  • trunk/Source/WebCore/platform/Cairo.cmake

    r256892 r268453  
    1515    platform/graphics/cairo/GraphicsContextImplCairo.h
    1616    platform/graphics/cairo/ImageBufferCairoBackend.h
    17     platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.h
    1817    platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.h
    1918    platform/graphics/cairo/ImageBufferCairoSurfaceBackend.h
  • trunk/Source/WebCore/platform/SourcesCairo.txt

    r258204 r268453  
    3232platform/graphics/cairo/GraphicsContextImplCairo.cpp
    3333platform/graphics/cairo/ImageBufferCairoBackend.cpp
    34 platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp
    3534platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.cpp
    3635platform/graphics/cairo/ImageBufferCairoSurfaceBackend.cpp
  • trunk/Source/WebCore/platform/graphics/GLContext.h

    r256428 r268453  
    7575    virtual bool isEGLContext() const = 0;
    7676
    77 #if USE(CAIRO)
    78     virtual cairo_device_t* cairoDevice() = 0;
    79 #endif
    80 
    8177#if ENABLE(GRAPHICS_CONTEXT_GL)
    8278    virtual PlatformGraphicsContextGL platformContext() = 0;
  • trunk/Source/WebCore/platform/graphics/PlatformImageBuffer.h

    r264805 r268453  
    3939#if HAVE(IOSURFACE)
    4040#include "ImageBufferIOSurfaceBackend.h"
    41 #elif USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    42 #include "ImageBufferCairoGLSurfaceBackend.h"
    4341#endif
    4442
     
    5553#if HAVE(IOSURFACE)
    5654using AcceleratedImageBufferBackend = ImageBufferIOSurfaceBackend;
    57 #elif USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    58 using AcceleratedImageBufferBackend = ImageBufferCairoGLSurfaceBackend;
    5955#else
    6056using AcceleratedImageBufferBackend = UnacceleratedImageBufferBackend;
  • trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp

    r267398 r268453  
    4343#include <wtf/UniqueArray.h>
    4444#include <wtf/Vector.h>
    45 
    46 #if ENABLE(ACCELERATED_2D_CANVAS)
    47 #if USE(EGL) && USE(LIBEPOXY)
    48 #include "EpoxyEGL.h"
    49 #endif
    50 #include <cairo-gl.h>
    51 #endif
    5245
    5346#if OS(WINDOWS)
     
    322315    case CAIRO_SURFACE_TYPE_IMAGE:
    323316        return IntSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
    324 #if ENABLE(ACCELERATED_2D_CANVAS)
    325     case CAIRO_SURFACE_TYPE_GL:
    326         return IntSize(cairo_gl_surface_get_width(surface), cairo_gl_surface_get_height(surface));
    327 #endif
    328317#if OS(WINDOWS)
    329318    case CAIRO_SURFACE_TYPE_WIN32:
  • trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp

    r267711 r268453  
    4444#else
    4545#include "OpenGLShims.h"
    46 #endif
    47 
    48 #if ENABLE(ACCELERATED_2D_CANVAS)
    49 // cairo-gl.h includes some definitions from GLX that conflict with
    50 // the ones provided by us. Since GLContextEGL doesn't use any GLX
    51 // functions we can safely disable them.
    52 #undef CAIRO_HAS_GLX_FUNCTIONS
    53 #include <cairo-gl.h>
    5446#endif
    5547
     
    376368GLContextEGL::~GLContextEGL()
    377369{
    378 #if USE(CAIRO)
    379     if (m_cairoDevice)
    380         cairo_device_destroy(m_cairoDevice);
    381 #endif
    382 
    383370    EGLDisplay display = m_display.eglDisplay();
    384371    if (m_context) {
     
    505492}
    506493
    507 #if USE(CAIRO)
    508 cairo_device_t* GLContextEGL::cairoDevice()
    509 {
    510     if (m_cairoDevice)
    511         return m_cairoDevice;
    512 
    513 #if ENABLE(ACCELERATED_2D_CANVAS)
    514     m_cairoDevice = cairo_egl_device_create(m_display.eglDisplay(), m_context);
    515 #endif
    516 
    517     return m_cairoDevice;
    518 }
    519 #endif
    520 
    521494#if ENABLE(GRAPHICS_CONTEXT_GL)
    522495PlatformGraphicsContextGL GLContextEGL::platformContext()
  • trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h

    r254064 r268453  
    6464    IntSize defaultFrameBufferSize() override;
    6565    void swapInterval(int) override;
    66 #if USE(CAIRO)
    67     cairo_device_t* cairoDevice() override;
    68 #endif
    6966    bool isEGLContext() const override { return true; }
    7067
     
    119116    struct wpe_renderer_backend_egl_offscreen_target* m_wpeTarget { nullptr };
    120117#endif
    121 #if USE(CAIRO)
    122     cairo_device_t* m_cairoDevice { nullptr };
    123 #endif
    124118};
    125119
  • trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp

    r268000 r268453  
    2626#include <GL/glx.h>
    2727#include <cairo.h>
    28 
    29 #if ENABLE(ACCELERATED_2D_CANVAS)
    30 #include <cairo-gl.h>
    31 #endif
    3228
    3329namespace WebCore {
     
    326322GLContextGLX::~GLContextGLX()
    327323{
    328     if (m_cairoDevice)
    329         cairo_device_destroy(m_cairoDevice);
    330 
    331324    if (m_context) {
    332325        // Due to a bug in some nvidia drivers, we need bind the default framebuffer in a context before
     
    402395}
    403396
    404 cairo_device_t* GLContextGLX::cairoDevice()
    405 {
    406     if (m_cairoDevice)
    407         return m_cairoDevice;
    408 
    409 #if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS
    410     m_cairoDevice = cairo_glx_device_create(m_x11Display, m_context.get());
    411 #endif
    412 
    413     return m_cairoDevice;
    414 }
    415 
    416397#if ENABLE(GRAPHICS_CONTEXT_GL)
    417398PlatformGraphicsContextGL GLContextGLX::platformContext()
  • trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h

    r254064 r268453  
    4848    IntSize defaultFrameBufferSize() override;
    4949    void swapInterval(int) override;
    50     cairo_device_t* cairoDevice() override;
    5150    bool isEGLContext() const override { return false; }
    5251
     
    6968    XUniquePixmap m_pixmap;
    7069    XUniqueGLXPixmap m_glxPixmap;
    71     cairo_device_t* m_cairoDevice { nullptr };
    7270};
    7371
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

    r267787 r268453  
    130130#include "TextureMapperPlatformLayerBuffer.h"
    131131#include "TextureMapperPlatformLayerProxy.h"
    132 #if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    133 #include <cairo-gl.h>
    134 #include "GLContext.h"
    135 #include "PlatformDisplay.h"
    136 // cairo-gl.h ends up including X.h, which defines None, breaking MediaPlayer:: enums.
    137 #undef None
    138 #endif
    139132#endif // USE(TEXTURE_MAPPER_GL)
    140133
     
    32193212NativeImagePtr MediaPlayerPrivateGStreamer::nativeImageForCurrentTime()
    32203213{
    3221 #if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    3222     if (m_isUsingFallbackVideoSink)
    3223         return nullptr;
    3224 
    3225     auto sampleLocker = holdLock(m_sampleMutex);
    3226 
    3227     if (!GST_IS_SAMPLE(m_sample.get()))
    3228         return nullptr;
    3229 
    3230     std::unique_ptr<GstVideoFrameHolder> frameHolder = makeUnique<GstVideoFrameHolder>(m_sample.get(), m_videoDecoderPlatform, m_textureMapperFlags, true);
    3231 
    3232     std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer = frameHolder->platformLayerBuffer();
    3233     if (!layerBuffer)
    3234         return nullptr;
    3235 
    3236     auto size = frameHolder->size();
    3237     if (m_videoSourceOrientation.usesWidthAsHeight())
    3238         size = size.transposedSize();
    3239 
    3240     GLContext* context = PlatformDisplay::sharedDisplayForCompositing().sharingGLContext();
    3241     context->makeContextCurrent();
    3242 
    3243     if (!m_videoTextureCopier)
    3244         m_videoTextureCopier = makeUnique<VideoTextureCopierGStreamer>(TEXTURE_COPIER_COLOR_CONVERT_FLAG);
    3245 
    3246     frameHolder->waitForCPUSync();
    3247 
    3248     if (!m_videoTextureCopier->copyVideoTextureToPlatformTexture(*layerBuffer.get(), size, 0, GL_TEXTURE_2D, 0, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, false, m_videoSourceOrientation))
    3249         return nullptr;
    3250 
    3251     return adoptRef(cairo_gl_surface_create_for_texture(context->cairoDevice(), CAIRO_CONTENT_COLOR_ALPHA, m_videoTextureCopier->resultTexture(), size.width(), size.height()));
    3252 #else
    32533214    return nullptr;
    3254 #endif
    32553215}
    32563216#endif // USE(GSTREAMER_GL)
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r268366 r268453  
    9595        return CanvasAsLayerContents;
    9696
    97 #if ENABLE(ACCELERATED_2D_CANVAS)
    98     return CanvasAsLayerContents;
    99 #else
    10097    return CanvasPaintedToLayer; // On Mac and iOS we paint accelerated canvases into their layers.
    101 #endif
    10298}
    10399
     
    10591055    }
    10601056#endif
    1061 #if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
     1057#if ENABLE(WEBGL) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
    10621058    else if (renderer().isCanvas() && canvasCompositingStrategy(renderer()) == CanvasAsLayerContents) {
    10631059        const HTMLCanvasElement* canvas = downcast<HTMLCanvasElement>(renderer().element());
     
    27742770#endif
    27752771
    2776 #if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(OFFSCREEN_CANVAS)
     2772#if ENABLE(WEBGL) || ENABLE(OFFSCREEN_CANVAS)
    27772773    if (is<RenderHTMLCanvas>(renderer()) && canvasCompositingStrategy(renderer()) == CanvasAsLayerContents)
    27782774        return m_owningLayer.hasVisibleBoxDecorationsOrBackground();
     
    28392835        m_owningLayer.setNeedsCompositingConfigurationUpdate();
    28402836
    2841 #if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
     2837#if ENABLE(WEBGL) || ENABLE(WEBGPU) || ENABLE(OFFSCREEN_CANVAS)
    28422838    if ((changeType == CanvasChanged || changeType == CanvasPixelsChanged) && renderer().isCanvas() && canvasCompositingStrategy(renderer()) == CanvasAsLayerContents) {
    28432839        if (changeType == CanvasChanged)
  • trunk/Source/cmake/OptionsFTW.cmake

    r267885 r268453  
    131131
    132132# Off for now, but should be on
    133 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PRIVATE OFF)
    134133WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
    135134WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE OFF)
  • trunk/Source/cmake/OptionsGTK.cmake

    r268389 r268453  
    106106WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
    107107
    108 # FIXME: Can we use cairo-glesv2 to avoid this conflict?
    109 WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
    110 
    111108WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_GRAPHICS_CONTEXT_GL)
    112 WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GRAPHICS_CONTEXT_GL)
    113109WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_GRAPHICS_CONTEXT_GL)
    114110WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_GRAPHICS_CONTEXT_GL)
     
    152148# without approval from a GTK reviewer. There must be strong reason to support
    153149# changing the value of the option.
    154 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
    155150WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
    156151WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
     
    245240endif ()
    246241
    247 if (ENABLE_ACCELERATED_2D_CANVAS)
    248     if (GLX_FOUND)
    249         list(APPEND CAIROGL_COMPONENTS cairo-glx)
    250     endif ()
    251     if (EGL_FOUND)
    252         list(APPEND CAIROGL_COMPONENTS cairo-egl)
    253     endif ()
    254 
    255     find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
    256     if (NOT CAIROGL_FOUND)
    257         message(FATAL_ERROR "CairoGL is needed for ENABLE_ACCELERATED_2D_CANVAS")
    258     endif ()
    259 endif ()
    260 
    261242if (USE_LIBSECRET)
    262243    find_package(Libsecret)
  • trunk/Source/cmake/OptionsWPE.cmake

    r268388 r268453  
    4545# without approval from a WPE reviewer. There must be strong reason to support
    4646# changing the value of the option.
    47 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
    4847WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
    4948WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
     
    153152endif ()
    154153
    155 if (ENABLE_ACCELERATED_2D_CANVAS)
    156     find_package(CairoGL 1.10.2 REQUIRED COMPONENTS cairo-egl)
    157 endif ()
    158 
    159154if (ENABLE_WEB_CRYPTO)
    160155    find_package(Libtasn1 REQUIRED)
  • trunk/Source/cmake/OptionsWin.cmake

    r268281 r268453  
    1919# FIXME: Most of these options should not be public.
    2020WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
    21 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
    2221WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PUBLIC OFF)
    2322WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PUBLIC ON)
  • trunk/Source/cmake/WebKitFeatures.cmake

    r267885 r268453  
    9797
    9898    WEBKIT_OPTION_DEFINE(ENABLE_3D_TRANSFORMS "Toggle 3D transforms support" PRIVATE ON)
    99     WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle Accelerated 2D Canvas support" PRIVATE OFF)
    10099    WEBKIT_OPTION_DEFINE(ENABLE_CORE_IMAGE_ACCELERATED_FILTER_RENDER "Toggle Accelerated CSS/SVG Filter Rendering using CoreImage" PRIVATE OFF)
    101100    WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Whether to enable support for accessibility" PRIVATE ON)
  • trunk/Source/cmake/tools/vsprops/FeatureDefines.props

    r267497 r268453  
    33  <PropertyGroup Label="UserMacros">
    44    <ENABLE_3D_TRANSFORMS>ENABLE_3D_TRANSFORMS</ENABLE_3D_TRANSFORMS>
    5     <ENABLE_ACCELERATED_2D_CANVAS />
    65    <ENABLE_OVERFLOW_SCROLLING_TOUCH />
    76    <ENABLE_ATTACHMENT_ELEMENT>ENABLE_ATTACHMENT_ELEMENT</ENABLE_ATTACHMENT_ELEMENT>
     
    7069  <ItemDefinitionGroup>
    7170    <ClCompile>
    72       <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_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>
     71      <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>
    7372    </ClCompile>
    7473  </ItemDefinitionGroup>
     
    7877      <EnvironmentVariable>true</EnvironmentVariable>
    7978    </BuildMacro>
    80     <BuildMacro Include="ENABLE_ACCELERATED_2D_CANVAS">
    81       <Value>$(ENABLE_ACCELERATED_2D_CANVAS)</Value>
    82       <EnvironmentVariable>true</EnvironmentVariable>
    83     </BuildMacro>
    8479    <BuildMacro Include="ENABLE_OVERFLOW_SCROLLING_TOUCH">
    8580      <Value>$(ENABLE_OVERFLOW_SCROLLING_TOUCH)</Value>
  • trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props

    r267497 r268453  
    33  <PropertyGroup Label="UserMacros">
    44    <ENABLE_3D_TRANSFORMS>ENABLE_3D_TRANSFORMS</ENABLE_3D_TRANSFORMS>
    5     <ENABLE_ACCELERATED_2D_CANVAS />
    65    <ENABLE_OVERFLOW_SCROLLING_TOUCH />
    76    <ENABLE_ATTACHMENT_ELEMENT>ENABLE_ATTACHMENT_ELEMENT</ENABLE_ATTACHMENT_ELEMENT>
     
    7069  <ItemDefinitionGroup>
    7170    <ClCompile>
    72       <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_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>
     71      <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>
    7372    </ClCompile>
    7473  </ItemDefinitionGroup>
     
    7877      <EnvironmentVariable>true</EnvironmentVariable>
    7978    </BuildMacro>
    80     <BuildMacro Include="ENABLE_ACCELERATED_2D_CANVAS">
    81       <Value>$(ENABLE_ACCELERATED_2D_CANVAS)</Value>
    82       <EnvironmentVariable>true</EnvironmentVariable>
    83     </BuildMacro>
    8479    <BuildMacro Include="ENABLE_OVERFLOW_SCROLLING_TOUCH">
    8580      <Value>$(ENABLE_OVERFLOW_SCROLLING_TOUCH)</Value>
  • trunk/Tools/ChangeLog

    r268447 r268453  
     12020-10-14  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove ACCELERATED_2D_CANVAS build flags and guarded code
     4        https://bugs.webkit.org/show_bug.cgi?id=217603
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9        Remove the ACCELERATED_2D_CANVAS feature flag.
     10
    1112020-10-14  Diego Pino Garcia  <dpino@igalia.com>
    212
  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r267885 r268453  
    5050
    5151my (
    52     $accelerated2DCanvasSupport,
    5352    $accessibilityIsolatedTreeSupport,
    5453    $applePaySessionV3Support,
     
    198197      define => "ENABLE_3D_TRANSFORMS", value => \$threeDTransformsSupport },
    199198
    200     { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
    201       define => "ENABLE_ACCELERATED_2D_CANVAS", value => \$accelerated2DCanvasSupport },
    202 
    203199    { option => "accessibility-isolated-tree", desc => "Toggle accessibility isolated tree support",
    204200      define => "ENABLE_ACCESSIBILITY_ISOLATED_TREE", value => \$accessibilityIsolatedTreeSupport },
Note: See TracChangeset for help on using the changeset viewer.