⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 243981 in webkit


Ignore:
Timestamp:
Apr 8, 2019, 3:14:55 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r242205 - [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
​https://bugs.webkit.org/show_bug.cgi?id=195159

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-02-28
Reviewed by Don Olmstead.

.:

  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsPlayStation.cmake:
  • Source/cmake/OptionsWPE.cmake:

Source/WebCore:

Use COORDINATED_GRAPHICS instead.

  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/PlatformLayer.h:
  • platform/graphics/cairo/ImageBufferCairo.cpp:

(WebCore::ImageBufferData::ImageBufferData):
(WebCore::ImageBufferData::~ImageBufferData):

  • platform/graphics/cairo/ImageBufferDataCairo.h:
  • platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp:
  • platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h:
  • platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp:

(Nicosia::GC3DLayer::swapBuffersIfNeeded):

  • platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::reshapeFBOs):

  • platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::prepareTexture):

  • platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:

(WebCore::GraphicsContext3D::reshapeFBOs):

  • platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp:

(WebCore::GraphicsContext3D::GraphicsContext3D):
(WebCore::GraphicsContext3D::~GraphicsContext3D):

  • platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp:

(WebCore::TextureMapperGC3DPlatformLayer::TextureMapperGC3DPlatformLayer):
(WebCore::TextureMapperGC3DPlatformLayer::~TextureMapperGC3DPlatformLayer):

  • platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h:
  • platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:
  • platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
  • platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp:
  • platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:
  • platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h:
  • platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::setContentsNeedsDisplay):
(WebCore::CoordinatedGraphicsLayer::setContentsToPlatformLayer):
(WebCore::CoordinatedGraphicsLayer::updatePlatformLayer):

  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::paintsIntoWindow const):

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::shouldCompositeOverflowControls const):

Source/WebKit:

Use COORDINATED_GRAPHICS instead.

  • Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:

(WebKit::CoordinatedGraphicsScene::onNewBufferAvailable):

  • Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
  • Shared/CoordinatedGraphics/SimpleViewportController.cpp:
  • Shared/CoordinatedGraphics/SimpleViewportController.h:
  • Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
  • Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
  • Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
  • Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
  • Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp:
  • Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h:
  • WebProcess/WebPage/AcceleratedDrawingArea.cpp:

(WebKit::AcceleratedDrawingArea::mainFrameContentSizeChanged):
(WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):

  • WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:
  • WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
  • WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::updatePreferences):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::sendViewportAttributesChanged):
(WebKit::WebPage::viewportPropertiesDidChange):

  • WebProcess/gtk/WebProcessMainGtk.cpp:
Location:
releases/WebKitGTK/webkit-2.24
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.24/ChangeLog

    r243535 r243981  
     12019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
     4        https://bugs.webkit.org/show_bug.cgi?id=195159
     5
     6        Reviewed by Don Olmstead.
     7
     8        * Source/cmake/OptionsGTK.cmake:
     9        * Source/cmake/OptionsPlayStation.cmake:
     10        * Source/cmake/OptionsWPE.cmake:
     11
    1122019-03-27  Adrian Perez de Castro  <aperez@igalia.com>
    213

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog

    r243978 r243981  
     12019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
     4        https://bugs.webkit.org/show_bug.cgi?id=195159
     5
     6        Reviewed by Don Olmstead.
     7
     8        Use COORDINATED_GRAPHICS instead.
     9
     10        * platform/graphics/GraphicsContext3D.h:
     11        * platform/graphics/PlatformLayer.h:
     12        * platform/graphics/cairo/ImageBufferCairo.cpp:
     13        (WebCore::ImageBufferData::ImageBufferData):
     14        (WebCore::ImageBufferData::~ImageBufferData):
     15        * platform/graphics/cairo/ImageBufferDataCairo.h:
     16        * platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp:
     17        * platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h:
     18        * platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp:
     19        (Nicosia::GC3DLayer::swapBuffersIfNeeded):
     20        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
     21        (WebCore::GraphicsContext3D::reshapeFBOs):
     22        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     23        (WebCore::GraphicsContext3D::prepareTexture):
     24        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
     25        (WebCore::GraphicsContext3D::reshapeFBOs):
     26        * platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp:
     27        (WebCore::GraphicsContext3D::GraphicsContext3D):
     28        (WebCore::GraphicsContext3D::~GraphicsContext3D):
     29        * platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp:
     30        (WebCore::TextureMapperGC3DPlatformLayer::TextureMapperGC3DPlatformLayer):
     31        (WebCore::TextureMapperGC3DPlatformLayer::~TextureMapperGC3DPlatformLayer):
     32        * platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h:
     33        * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:
     34        * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
     35        * platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp:
     36        * platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:
     37        * platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h:
     38        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
     39        (WebCore::CoordinatedGraphicsLayer::setContentsNeedsDisplay):
     40        (WebCore::CoordinatedGraphicsLayer::setContentsToPlatformLayer):
     41        (WebCore::CoordinatedGraphicsLayer::updatePlatformLayer):
     42        * rendering/RenderLayerBacking.cpp:
     43        (WebCore::RenderLayerBacking::paintsIntoWindow const):
     44        * rendering/RenderLayerCompositor.cpp:
     45        (WebCore::RenderLayerCompositor::shouldCompositeOverflowControls const):
     46
    1472019-03-27  Philippe Normand  <pnormand@igalia.com>
    248

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r239427 r243981  
    14371437    GC3Duint m_texture { 0 };
    14381438    GC3Duint m_fbo { 0 };
    1439 #if USE(COORDINATED_GRAPHICS_THREADED)
     1439#if USE(COORDINATED_GRAPHICS)
    14401440    GC3Duint m_compositorTexture { 0 };
    14411441    GC3Duint m_intermediateTexture { 0 };

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/PlatformLayer.h

    r234688 r243981  
    3636}
    3737typedef Nicosia::PlatformLayer PlatformLayer;
    38 #elif USE(COORDINATED_GRAPHICS_THREADED)
     38#elif USE(COORDINATED_GRAPHICS)
    3939namespace WebCore {
    4040class TextureMapperPlatformLayerProxyProvider;

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

    r239549 r243981  
    7070#endif
    7171
    72 #if USE(COORDINATED_GRAPHICS_THREADED)
     72#if USE(COORDINATED_GRAPHICS)
    7373#include "TextureMapperPlatformLayerBuffer.h"
    7474#include "TextureMapperPlatformLayerProxy.h"
    … …  
    8484    , m_renderingMode(renderingMode)
    8585#if ENABLE(ACCELERATED_2D_CANVAS)
    86 #if USE(COORDINATED_GRAPHICS_THREADED)
     86#if USE(COORDINATED_GRAPHICS)
    8787    , m_compositorTexture(0)
    8888#endif
    … …  
    9090#endif
    9191{
    92 #if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS_THREADED)
     92#if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS)
    9393    if (m_renderingMode == RenderingMode::Accelerated) {
    9494#if USE(NICOSIA)
    … …  
    107107
    108108#if ENABLE(ACCELERATED_2D_CANVAS)
    109 #if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
     109#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
    110110    downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).invalidateClient();
    111111#endif
    … …  
    117117        glDeleteTextures(1, &m_texture);
    118118
    119 #if USE(COORDINATED_GRAPHICS_THREADED)
     119#if USE(COORDINATED_GRAPHICS)
    120120    if (m_compositorTexture)
    121121        glDeleteTextures(1, &m_compositorTexture);
    … …  
    128128
    129129#if ENABLE(ACCELERATED_2D_CANVAS)
    130 #if USE(COORDINATED_GRAPHICS_THREADED)
     130#if USE(COORDINATED_GRAPHICS)
    131131void ImageBufferData::createCompositorBuffer()
    132132{
    … …  
    675675#endif
    676676
    677 #if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS_THREADED)
     677#if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS)
    678678void ImageBufferData::paintToTextureMapper(TextureMapper& textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
    679679{

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h

    r234688 r243981  
    7070    void createCairoGLSurface();
    7171
    72 #if USE(COORDINATED_GRAPHICS_THREADED)
     72#if USE(COORDINATED_GRAPHICS)
    7373#if USE(NICOSIA)
    7474    void swapBuffersIfNeeded() override;

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp

    r233122 r243981  
    3030#include "NicosiaPaintingEngineThreaded.h"
    3131
    32 #if USE(COORDINATED_GRAPHICS_THREADED)
     32#if USE(COORDINATED_GRAPHICS)
    3333
    3434#include "GraphicsContext.h"
    … …  
    9090} // namespace Nicosia
    9191
    92 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     92#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h

    r232958 r243981  
    2929#pragma once
    3030
    31 #if USE(COORDINATED_GRAPHICS_THREADED)
     31#if USE(COORDINATED_GRAPHICS)
    3232
    3333#include "NicosiaPaintingEngine.h"
    … …  
    4949} // namespace Nicosia
    5050
    51 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     51#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp

    r234688 r243981  
    3232#if USE(NICOSIA) && USE(TEXTURE_MAPPER)
    3333
    34 #if USE(COORDINATED_GRAPHICS_THREADED)
     34#if USE(COORDINATED_GRAPHICS)
    3535#include "TextureMapperGL.h"
    3636#include "TextureMapperPlatformLayerBuffer.h"
    … …  
    7777void GC3DLayer::swapBuffersIfNeeded()
    7878{
    79 #if USE(COORDINATED_GRAPHICS_THREADED)
     79#if USE(COORDINATED_GRAPHICS)
    8080    if (m_context.layerComposited())
    8181        return;

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

    r237266 r243981  
    197197    ::glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_texture, 0);
    198198
    199 #if USE(COORDINATED_GRAPHICS_THREADED)
     199#if USE(COORDINATED_GRAPHICS)
    200200    if (m_compositorTexture) {
    201201        ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r241256 r243981  
    227227    makeContextCurrent();
    228228
    229 #if !USE(COORDINATED_GRAPHICS_THREADED)
     229#if !USE(COORDINATED_GRAPHICS)
    230230    TemporaryOpenGLSetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
    231231    TemporaryOpenGLSetting scopedDither(GL_DITHER, GL_FALSE);
    … …  
    235235        resolveMultisamplingIfNecessary();
    236236
    237 #if USE(COORDINATED_GRAPHICS_THREADED)
     237#if USE(COORDINATED_GRAPHICS)
    238238    std::swap(m_texture, m_compositorTexture);
    239239    std::swap(m_texture, m_intermediateTexture);

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp

    r237266 r243981  
    111111    ::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);
    112112
    113 #if USE(COORDINATED_GRAPHICS_THREADED)
     113#if USE(COORDINATED_GRAPHICS)
    114114    if (m_compositorTexture) {
    115115        ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp

    r234710 r243981  
    134134        ::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
    135135
    136 #if USE(COORDINATED_GRAPHICS_THREADED)
     136#if USE(COORDINATED_GRAPHICS)
    137137        ::glGenTextures(1, &m_compositorTexture);
    138138        ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
    … …  
    236236    if (m_texture)
    237237        ::glDeleteTextures(1, &m_texture);
    238 #if USE(COORDINATED_GRAPHICS_THREADED)
     238#if USE(COORDINATED_GRAPHICS)
    239239    if (m_compositorTexture)
    240240        ::glDeleteTextures(1, &m_compositorTexture);
    … …  
    258258    }
    259259    ::glDeleteFramebuffers(1, &m_fbo);
    260 #if USE(COORDINATED_GRAPHICS_THREADED)
     260#if USE(COORDINATED_GRAPHICS)
    261261    ::glDeleteTextures(1, &m_intermediateTexture);
    262262#endif

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp

    r234688 r243981  
    4343    }
    4444
    45 #if USE(COORDINATED_GRAPHICS_THREADED)
     45#if USE(COORDINATED_GRAPHICS)
    4646    m_platformLayerProxy = adoptRef(new TextureMapperPlatformLayerProxy());
    4747#endif
    … …  
    5050TextureMapperGC3DPlatformLayer::~TextureMapperGC3DPlatformLayer()
    5151{
    52 #if !USE(COORDINATED_GRAPHICS_THREADED)
     52#if !USE(COORDINATED_GRAPHICS)
    5353    if (client())
    5454        client()->platformLayerWillBeDestroyed();
    … …  
    6868}
    6969
    70 #if USE(COORDINATED_GRAPHICS_THREADED)
     70#if USE(COORDINATED_GRAPHICS)
    7171RefPtr<TextureMapperPlatformLayerProxy> TextureMapperGC3DPlatformLayer::proxy() const
    7272{
    … …  
    116116#endif // USE(TEXTURE_MAPPER_GL)
    117117}
    118 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     118#endif // USE(COORDINATED_GRAPHICS)
    119119
    120120} // namespace WebCore

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h

    r234688 r243981  
    4040    PlatformGraphicsContext3D platformContext();
    4141
    42 #if USE(COORDINATED_GRAPHICS_THREADED)
     42#if USE(COORDINATED_GRAPHICS)
    4343    RefPtr<TextureMapperPlatformLayerProxy> proxy() const override;
    4444    void swapBuffersIfNeeded() override;
    … …  
    5151    std::unique_ptr<GLContext> m_glContext;
    5252
    53 #if USE(COORDINATED_GRAPHICS_THREADED)
     53#if USE(COORDINATED_GRAPHICS)
    5454    RefPtr<TextureMapperPlatformLayerProxy> m_platformLayerProxy;
    5555#endif

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp

    r242450 r243981  
    2727#include "TextureMapperPlatformLayerBuffer.h"
    2828
    29 #if USE(COORDINATED_GRAPHICS_THREADED)
     29#if USE(COORDINATED_GRAPHICS)
    3030
    3131#include "FloatRect.h"
    … …  
    9393} // namespace WebCore
    9494
    95 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     95#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h

    r241120 r243981  
    2626#pragma once
    2727
    28 #if USE(COORDINATED_GRAPHICS_THREADED)
     28#if USE(COORDINATED_GRAPHICS)
    2929
    3030#include "BitmapTextureGL.h"
    … …  
    8989} // namespace WebCore
    9090
    91 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     91#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp

    r242877 r243981  
    2727#include "TextureMapperPlatformLayerProxy.h"
    2828
    29 #if USE(COORDINATED_GRAPHICS_THREADED)
     29#if USE(COORDINATED_GRAPHICS)
    3030
    3131#include "BitmapTextureGL.h"
    … …  
    267267} // namespace WebCore
    268268
    269 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     269#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h

    r242877 r243981  
    2424 */
    2525
    26 #ifndef TextureMapperPlatformLayerProxy_h
    27 #define TextureMapperPlatformLayerProxy_h
     26#pragma once
    2827
    29 #if USE(COORDINATED_GRAPHICS_THREADED)
     28#if USE(COORDINATED_GRAPHICS)
    3029
    3130#include "TextureMapperGLHeaders.h"
    … …  
    106105} // namespace WebCore
    107106
    108 #endif // USE(COORDINATED_GRAPHICS_THREADED)
    109 
    110 #endif // TextureMapperPlatformLayerProxy_h
     107#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h

    r220397 r243981  
    2626#pragma once
    2727
    28 #if USE(COORDINATED_GRAPHICS_THREADED)
     28#if USE(COORDINATED_GRAPHICS)
    2929
    3030namespace WebCore {
    … …  
    4040} // namespace WebCore
    4141
    42 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     42#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

    r242873 r243981  
    396396void CoordinatedGraphicsLayer::setContentsNeedsDisplay()
    397397{
    398 #if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
     398#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
    399399    if (m_nicosia.contentLayer)
    400400        m_shouldUpdatePlatformLayer = true;
    … …  
    407407void CoordinatedGraphicsLayer::setContentsToPlatformLayer(PlatformLayer* platformLayer, ContentsLayerPurpose)
    408408{
    409 #if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
     409#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
    410410    auto* contentLayer = downcast<Nicosia::ContentLayer>(platformLayer);
    411411    if (m_nicosia.contentLayer != contentLayer) {
    … …  
    617617
    618618    m_shouldUpdatePlatformLayer = false;
    619 #if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
     619#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
    620620    if (m_nicosia.contentLayer)
    621621        downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosia.contentLayer->impl()).swapBuffersIfNeeded();

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerBacking.cpp

    r241811 r243981  
    24022402bool RenderLayerBacking::paintsIntoWindow() const
    24032403{
    2404 #if USE(COORDINATED_GRAPHICS_THREADED)
     2404#if USE(COORDINATED_GRAPHICS)
    24052405        return false;
    24062406#endif

  • releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r242490 r243981  
    30633063        return true;
    30643064
    3065 #if !USE(COORDINATED_GRAPHICS_THREADED)
     3065#if !USE(COORDINATED_GRAPHICS)
    30663066    if (!frameView.hasOverlayScrollbars())
    30673067        return false;

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog

    r243980 r243981  
     12019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
     4        https://bugs.webkit.org/show_bug.cgi?id=195159
     5
     6        Reviewed by Don Olmstead.
     7
     8        Use COORDINATED_GRAPHICS instead.
     9
     10        * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
     11        (WebKit::CoordinatedGraphicsScene::onNewBufferAvailable):
     12        * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
     13        * Shared/CoordinatedGraphics/SimpleViewportController.cpp:
     14        * Shared/CoordinatedGraphics/SimpleViewportController.h:
     15        * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
     16        * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
     17        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
     18        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
     19        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp:
     20        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h:
     21        * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
     22        (WebKit::AcceleratedDrawingArea::mainFrameContentSizeChanged):
     23        (WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):
     24        * WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:
     25        * WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
     26        * WebProcess/WebPage/DrawingAreaImpl.cpp:
     27        (WebKit::DrawingAreaImpl::updatePreferences):
     28        * WebProcess/WebPage/WebPage.cpp:
     29        (WebKit::WebPage::sendViewportAttributesChanged):
     30        (WebKit::WebPage::viewportPropertiesDidChange):
     31        * WebProcess/gtk/WebProcessMainGtk.cpp:
     32
    1332019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
    234

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp

    r242461 r243981  
    9797}
    9898
    99 #if USE(COORDINATED_GRAPHICS_THREADED)
    10099void CoordinatedGraphicsScene::onNewBufferAvailable()
    101100{
    102101    updateViewport();
    103102}
    104 #endif
    105103
    106104Nicosia::CompositionLayerTextureMapperImpl& compositionLayerImpl(Nicosia::CompositionLayer& compositionLayer)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h

    r242461 r243981  
    1919*/
    2020
    21 #ifndef CoordinatedGraphicsScene_h
    22 #define CoordinatedGraphicsScene_h
     21#pragma once
    2322
    2423#if USE(COORDINATED_GRAPHICS)
    … …  
    3433#include <WebCore/TextureMapperFPSCounter.h>
    3534#include <WebCore/TextureMapperLayer.h>
     35#include <WebCore/TextureMapperPlatformLayerProxy.h>
    3636#include <WebCore/Timer.h>
    3737#include <wtf/Function.h>
    … …  
    4141#include <wtf/ThreadingPrimitives.h>
    4242#include <wtf/Vector.h>
    43 
    44 #if USE(COORDINATED_GRAPHICS_THREADED)
    45 #include <WebCore/TextureMapperPlatformLayerProxy.h>
    46 #endif
    4743
    4844namespace Nicosia {
    … …  
    6359};
    6460
    65 class CoordinatedGraphicsScene : public ThreadSafeRefCounted<CoordinatedGraphicsScene>
    66 #if USE(COORDINATED_GRAPHICS_THREADED)
    67     , public WebCore::TextureMapperPlatformLayerProxy::Compositor
    68 #endif
    69 {
     61class CoordinatedGraphicsScene : public ThreadSafeRefCounted<CoordinatedGraphicsScene>, public WebCore::TextureMapperPlatformLayerProxy::Compositor {
    7062public:
    7163    explicit CoordinatedGraphicsScene(CoordinatedGraphicsSceneClient*);
    … …  
    9385    void ensureRootLayer();
    9486
    95 #if USE(COORDINATED_GRAPHICS_THREADED)
    9687    void onNewBufferAvailable() override;
    97 #endif
    9888
    9989    struct {
    … …  
    119109#endif // USE(COORDINATED_GRAPHICS)
    120110
    121 #endif // CoordinatedGraphicsScene_h
    122111
    123 

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp

    r228373 r243981  
    2323#include "SimpleViewportController.h"
    2424
    25 #if USE(COORDINATED_GRAPHICS_THREADED)
     25#if USE(COORDINATED_GRAPHICS)
    2626
    2727namespace WebKit {
    … …  
    169169} // namespace WebCore
    170170
    171 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     171#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h

    r211350 r243981  
    2020 */
    2121
    22 #ifndef SimpleViewportController_h
    23 #define SimpleViewportController_h
     22#pragma once
    2423
    25 #if USE(COORDINATED_GRAPHICS_THREADED)
     24#if USE(COORDINATED_GRAPHICS)
    2625
    2726#include <WebCore/FloatPoint.h>
    … …  
    7776} // namespace WebKit
    7877
    79 #endif // USE(COORDINATED_GRAPHICS_THREADED)
    80 
    81 #endif // SimpleViewportController_h
     78#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp

    r243979 r243981  
    2727#include "CompositingRunLoop.h"
    2828
    29 #if USE(COORDINATED_GRAPHICS_THREADED)
     29#if USE(COORDINATED_GRAPHICS)
    3030
    3131#include <wtf/HashMap.h>
    … …  
    213213} // namespace WebKit
    214214
    215 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     215#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h

    r243979 r243981  
    2424 */
    2525
    26 #ifndef CompositingRunLoop_h
    27 #define CompositingRunLoop_h
     26#pragma once
    2827
    29 #if USE(COORDINATED_GRAPHICS_THREADED)
     28#if USE(COORDINATED_GRAPHICS)
    3029
    3130#include <wtf/Atomics.h>
    … …  
    8887} // namespace WebKit
    8988
    90 #endif // USE(COORDINATED_GRAPHICS_THREADED)
    91 
    92 #endif // CompositingRunLoop_h
     89#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp

    r242461 r243981  
    2727#include "ThreadedCompositor.h"
    2828
    29 #if USE(COORDINATED_GRAPHICS_THREADED)
     29#if USE(COORDINATED_GRAPHICS)
    3030
    3131#include "CompositingRunLoop.h"
    … …  
    332332
    333333}
    334 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     334#endif // USE(COORDINATED_GRAPHICS)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h

    r242461 r243981  
    2626#pragma once
    2727
    28 #if USE(COORDINATED_GRAPHICS_THREADED)
     28#if USE(COORDINATED_GRAPHICS)
    2929
    3030#include "CompositingRunLoop.h"
    … …  
    126126} // namespace WebKit
    127127
    128 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     128#endif // USE(COORDINATED_GRAPHICS)
    129129

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp

    r235111 r243981  
    2727#include "ThreadedDisplayRefreshMonitor.h"
    2828
    29 #if USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     29#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
    3030
    3131#include "CompositingRunLoop.h"
    … …  
    118118} // namespace WebKit
    119119
    120 #endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     120#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h

    r243980 r243981  
    2828#include <WebCore/DisplayRefreshMonitor.h>
    2929
    30 #if USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     30#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
    3131#include <wtf/RunLoop.h>
    3232
    … …  
    6565} // namespace WebKit
    6666
    67 #endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     67#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp

    r243980 r243981  
    136136void AcceleratedDrawingArea::mainFrameContentSizeChanged(const IntSize& size)
    137137{
    138 #if USE(COORDINATED_GRAPHICS_THREADED)
     138#if USE(COORDINATED_GRAPHICS)
    139139    if (m_layerTreeHost)
    140140        m_layerTreeHost->contentsSizeChanged(size);
    … …  
    333333            m_layerTreeHost->setLayerFlushSchedulingEnabled(true);
    334334    } else {
    335 #if USE(COORDINATED_GRAPHICS_THREADED)
     335#if USE(COORDINATED_GRAPHICS)
    336336        m_layerTreeHost = std::make_unique<LayerTreeHost>(m_webPage);
    337337#else
    … …  
    411411#endif
    412412
    413 #if USE(COORDINATED_GRAPHICS_THREADED)
     413#if USE(COORDINATED_GRAPHICS)
    414414void AcceleratedDrawingArea::didChangeViewportAttributes(ViewportAttributes&& attrs)
    415415{

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp

    r243980 r243981  
    3030#include "LayerTreeHost.h"
    3131
    32 #if USE(COORDINATED_GRAPHICS_THREADED)
     32#if USE(COORDINATED_GRAPHICS)
    3333
    3434#include "DrawingArea.h"

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h

    r243980 r243981  
    5454
    5555class LayerTreeHost
    56 #if USE(COORDINATED_GRAPHICS_THREADED)
     56#if USE(COORDINATED_GRAPHICS)
    5757    final : public CompositingCoordinator::Client, public AcceleratedSurface::Client
    5858#endif
    … …  
    9999
    100100private:
    101 #if USE(COORDINATED_GRAPHICS_THREADED)
     101#if USE(COORDINATED_GRAPHICS)
    102102    void layerFlushTimerFired();
    103103    void didChangeViewport();
    … …  
    172172        UpdateScale = 1 << 3
    173173    };
    174 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     174#endif // USE(COORDINATED_GRAPHICS)
    175175
    176176    WebPage& m_webPage;
    177177    LayerTreeContext m_layerTreeContext;
    178 #if USE(COORDINATED_GRAPHICS_THREADED)
     178#if USE(COORDINATED_GRAPHICS)
    179179    bool m_layerFlushSchedulingEnabled { true };
    180180    bool m_notifyAfterScheduledLayerFlush { false };
    … …  
    198198    } m_forceRepaintAsync;
    199199    RunLoop::Timer<LayerTreeHost> m_layerFlushTimer;
    200 #endif // USE(COORDINATED_GRAPHICS_THREADED)
     200#endif // USE(COORDINATED_GRAPHICS)
    201201};
    202202
    203 #if !USE(COORDINATED_GRAPHICS_THREADED)
     203#if !USE(COORDINATED_GRAPHICS)
    204204inline LayerTreeHost::LayerTreeHost(WebPage& webPage) : m_webPage(webPage) { }
    205205inline LayerTreeHost::~LayerTreeHost() { }

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp

    r243980 r243981  
    172172    settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
    173173
    174 #if USE(COORDINATED_GRAPHICS_THREADED)
     174#if USE(COORDINATED_GRAPHICS)
    175175    // Fixed position elements need to be composited and create stacking contexts
    176176    // in order to be scrolled by the ScrollingCoordinator.

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r242867 r243981  
    16071607    setFixedLayoutSize(roundedIntSize(attr.layoutSize));
    16081608
    1609 #if USE(COORDINATED_GRAPHICS_THREADED)
     1609#if USE(COORDINATED_GRAPHICS)
    16101610    m_drawingArea->didChangeViewportAttributes(WTFMove(attr));
    16111611#else
    … …  
    20012001    if (view && view->useFixedLayout())
    20022002        sendViewportAttributesChanged(viewportArguments);
    2003 #if USE(COORDINATED_GRAPHICS_THREADED)
    20042003    else
    20052004        m_drawingArea->didChangeViewportAttributes(ViewportAttributes());
    2006 #endif
    20072005#endif
    20082006

  • releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp

    r240683 r243981  
    5151#endif
    5252
    53 #if (USE(COORDINATED_GRAPHICS_THREADED) || USE(GSTREAMER_GL)) && PLATFORM(X11)
     53#if (USE(COORDINATED_GRAPHICS) || USE(GSTREAMER_GL)) && PLATFORM(X11)
    5454        XInitThreads();
    5555#endif

  • releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsGTK.cmake

    r242878 r243981  
    285285
    286286    SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
    287     SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
    288287    SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
    289288endif ()

  • releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsPlayStation.cmake

    r238913 r243981  
    114114SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D ON)
    115115SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ON)
    116 SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ON)
    117116SET_AND_EXPOSE_TO_BUILD(USE_EGL ON)
    118117SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)

  • releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake

    r243535 r243981  
    166166SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE TRUE)
    167167SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
    168 SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
    169168SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
    170169
Note: See TracChangeset for help on using the changeset viewer.