<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243981] releases/WebKitGTK/webkit-2.24</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243981">243981</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-08 03:14:55 -0700 (Mon, 08 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242205">r242205</a> - [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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224ChangeLog">releases/WebKitGTK/webkit-2.24/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsGraphicsContext3Dh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsPlatformLayerh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/PlatformLayer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicscairoImageBufferCairocpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicscairoImageBufferDataCairoh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsnicosiaNicosiaPaintingEngineThreadedcpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsnicosiaNicosiaPaintingEngineThreadedh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsnicosiatexmapNicosiaGC3DLayercpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapGraphicsContext3DTextureMappercpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayercpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayerh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerBuffercpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerBufferh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxycpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxyh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxyProviderh">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCorerenderingRenderLayerBackingcpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCorerenderingRenderLayerCompositorcpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsCoordinatedGraphicsSceneh">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsSimpleViewportControllercpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsSimpleViewportControllerh">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLoopcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedDisplayRefreshMonitorcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedDisplayRefreshMonitorh">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageAcceleratedDrawingAreacpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageCoordinatedGraphicsLayerTreeHostcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageCoordinatedGraphicsLayerTreeHosth">releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageDrawingAreaImplcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageWebPagecpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitWebProcessgtkWebProcessMainGtkcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourcecmakeOptionsPlayStationcmake">releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsPlayStation.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourcecmakeOptionsWPEcmake">releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/ChangeLog (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/ChangeLog 2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/ChangeLog    2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
+        https://bugs.webkit.org/show_bug.cgi?id=195159
+
+        Reviewed by Don Olmstead.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsPlayStation.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
</ins><span class="cx"> 2019-03-27  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.24.0 release
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
+        https://bugs.webkit.org/show_bug.cgi?id=195159
+
+        Reviewed by Don Olmstead.
+
+        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):
+
</ins><span class="cx"> 2019-03-27  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GStreamer] Remove the HLS queue buffering query hack
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/GraphicsContext3D.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/GraphicsContext3D.h      2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/GraphicsContext3D.h 2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -1436,7 +1436,7 @@
</span><span class="cx"> 
</span><span class="cx">     GC3Duint m_texture { 0 };
</span><span class="cx">     GC3Duint m_fbo { 0 };
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     GC3Duint m_compositorTexture { 0 };
</span><span class="cx">     GC3Duint m_intermediateTexture { 0 };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsPlatformLayerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/PlatformLayer.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/PlatformLayer.h  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/PlatformLayer.h     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class PlatformLayer;
</span><span class="cx"> }
</span><span class="cx"> typedef Nicosia::PlatformLayer PlatformLayer;
</span><del>-#elif USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#elif USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class TextureMapperPlatformLayerProxyProvider;
</span><span class="cx"> typedef TextureMapperPlatformLayerProxyProvider PlatformLayer;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #include "OpenGLShims.h"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> #include "TextureMapperPlatformLayerBuffer.h"
</span><span class="cx"> #include "TextureMapperPlatformLayerProxy.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx">     , m_size(size)
</span><span class="cx">     , m_renderingMode(renderingMode)
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     , m_compositorTexture(0)
</span><span class="cx"> #endif
</span><span class="cx">     , m_texture(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_renderingMode == RenderingMode::Accelerated) {
</span><span class="cx"> #if USE(NICOSIA)
</span><span class="cx">         m_nicosiaLayer = Nicosia::ContentLayer::create(Nicosia::ContentLayerTextureMapperImpl::createFactory(*this));
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
</del><ins>+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
</ins><span class="cx">     downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).invalidateClient();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">     if (m_texture)
</span><span class="cx">         glDeleteTextures(1, &m_texture);
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_compositorTexture)
</span><span class="cx">         glDeleteTextures(1, &m_compositorTexture);
</span><span class="cx"> #endif
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> void ImageBufferData::createCompositorBuffer()
</span><span class="cx"> {
</span><span class="cx">     auto* context = PlatformDisplay::sharedDisplayForCompositing().sharingGLContext();
</span><span class="lines">@@ -674,7 +674,7 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> void ImageBufferData::paintToTextureMapper(TextureMapper& textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_texture);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicscairoImageBufferDataCairoh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx">     void createCairoGLSurface();
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> #if USE(NICOSIA)
</span><span class="cx">     void swapBuffersIfNeeded() override;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsnicosiaNicosiaPaintingEngineThreadedcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NicosiaPaintingEngineThreaded.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "GraphicsLayer.h"
</span><span class="lines">@@ -89,4 +89,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace Nicosia
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsnicosiaNicosiaPaintingEngineThreadedh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "NicosiaPaintingEngine.h"
</span><span class="cx"> #include <wtf/WorkerPool.h>
</span><span class="lines">@@ -48,4 +48,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace Nicosia
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsnicosiatexmapNicosiaGC3DLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp      2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp 2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(NICOSIA) && USE(TEXTURE_MAPPER)
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> #include "TextureMapperGL.h"
</span><span class="cx"> #include "TextureMapperPlatformLayerBuffer.h"
</span><span class="cx"> #include "TextureMapperPlatformLayerProxy.h"
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> 
</span><span class="cx"> void GC3DLayer::swapBuffersIfNeeded()
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_context.layerComposited())
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">     ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
</span><span class="cx">     ::glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_texture, 0);
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_compositorTexture) {
</span><span class="cx">         ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
</span><span class="cx">         ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp    2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> 
</span><span class="cx">     makeContextCurrent();
</span><span class="cx"> 
</span><del>-#if !USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if !USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     TemporaryOpenGLSetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
</span><span class="cx">     TemporaryOpenGLSetting scopedDither(GL_DITHER, GL_FALSE);
</span><span class="cx"> #endif
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx">     if (m_attrs.antialias)
</span><span class="cx">         resolveMultisamplingIfNecessary();
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     std::swap(m_texture, m_compositorTexture);
</span><span class="cx">     std::swap(m_texture, m_intermediateTexture);
</span><span class="cx">     ::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">     ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, pixelDataType, 0);
</span><span class="cx">     ::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_compositorTexture) {
</span><span class="cx">         ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
</span><span class="cx">         ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapGraphicsContext3DTextureMappercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">         ::glGenFramebuffers(1, &m_fbo);
</span><span class="cx">         ::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">         ::glGenTextures(1, &m_compositorTexture);
</span><span class="cx">         ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
</span><span class="cx">         ::glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">     makeContextCurrent();
</span><span class="cx">     if (m_texture)
</span><span class="cx">         ::glDeleteTextures(1, &m_texture);
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_compositorTexture)
</span><span class="cx">         ::glDeleteTextures(1, &m_compositorTexture);
</span><span class="cx"> #endif
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">             ::glDeleteRenderbuffers(1, &m_depthStencilBuffer);
</span><span class="cx">     }
</span><span class="cx">     ::glDeleteFramebuffers(1, &m_fbo);
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     ::glDeleteTextures(1, &m_intermediateTexture);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     m_platformLayerProxy = adoptRef(new TextureMapperPlatformLayerProxy());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> 
</span><span class="cx"> TextureMapperGC3DPlatformLayer::~TextureMapperGC3DPlatformLayer()
</span><span class="cx"> {
</span><del>-#if !USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if !USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (client())
</span><span class="cx">         client()->platformLayerWillBeDestroyed();
</span><span class="cx"> #endif
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">     return m_glContext->platformContext();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> RefPtr<TextureMapperPlatformLayerProxy> TextureMapperGC3DPlatformLayer::proxy() const
</span><span class="cx"> {
</span><span class="cx">     return m_platformLayerProxy.copyRef();
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">     texmapGL.drawTexture(m_context.m_texture, flags, textureSize, targetRect, matrix, opacity);
</span><span class="cx"> #endif // USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> }
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">     bool makeContextCurrent();
</span><span class="cx">     PlatformGraphicsContext3D platformContext();
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     RefPtr<TextureMapperPlatformLayerProxy> proxy() const override;
</span><span class="cx">     void swapBuffersIfNeeded() override;
</span><span class="cx"> #else
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">     GraphicsContext3D& m_context;
</span><span class="cx">     std::unique_ptr<GLContext> m_glContext;
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     RefPtr<TextureMapperPlatformLayerProxy> m_platformLayerProxy;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerBuffercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp      2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp 2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextureMapperPlatformLayerBuffer.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="lines">@@ -92,4 +92,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerBufferh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "BitmapTextureGL.h"
</span><span class="cx"> #include "TextureMapperGLHeaders.h"
</span><span class="lines">@@ -88,4 +88,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextureMapperPlatformLayerProxy.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "BitmapTextureGL.h"
</span><span class="cx"> #include "TextureMapperGL.h"
</span><span class="lines">@@ -266,4 +266,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h    2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -23,10 +23,9 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef TextureMapperPlatformLayerProxy_h
-#define TextureMapperPlatformLayerProxy_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "TextureMapperGLHeaders.h"
</span><span class="cx"> #include <wtf/Condition.h>
</span><span class="lines">@@ -105,6 +104,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
-
-#endif // TextureMapperPlatformLayerProxy_h
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapTextureMapperPlatformLayerProxyProviderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h 2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h    2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -39,4 +39,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CoordinatedGraphicsLayer::setContentsNeedsDisplay()
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
</del><ins>+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
</ins><span class="cx">     if (m_nicosia.contentLayer)
</span><span class="cx">         m_shouldUpdatePlatformLayer = true;
</span><span class="cx"> #endif
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CoordinatedGraphicsLayer::setContentsToPlatformLayer(PlatformLayer* platformLayer, ContentsLayerPurpose)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
</del><ins>+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
</ins><span class="cx">     auto* contentLayer = downcast<Nicosia::ContentLayer>(platformLayer);
</span><span class="cx">     if (m_nicosia.contentLayer != contentLayer) {
</span><span class="cx">         m_nicosia.contentLayer = contentLayer;
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_shouldUpdatePlatformLayer = false;
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
</del><ins>+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
</ins><span class="cx">     if (m_nicosia.contentLayer)
</span><span class="cx">         downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosia.contentLayer->impl()).swapBuffersIfNeeded();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerBacking.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerBacking.cpp   2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerBacking.cpp      2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -2401,7 +2401,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool RenderLayerBacking::paintsIntoWindow() const
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">         return false;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerCompositor.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerCompositor.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderLayerCompositor.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -3062,7 +3062,7 @@
</span><span class="cx">     if (m_overflowControlsHostLayer && isMainFrameCompositor())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-#if !USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if !USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (!frameView.hasOverlayScrollbars())
</span><span class="cx">         return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog   2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog      2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><ins>+        [CoordinatedGraphics] Remove COORDINATED_GRAPHICS_THREADED option
+        https://bugs.webkit.org/show_bug.cgi?id=195159
+
+        Reviewed by Don Olmstead.
+
+        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:
+
+2019-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
</ins><span class="cx">         [CoordinatedGraphics] Unify all LayerTreeHost classes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195094
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -96,12 +96,10 @@
</span><span class="cx">         m_client->updateViewport();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><span class="cx"> void CoordinatedGraphicsScene::onNewBufferAvailable()
</span><span class="cx"> {
</span><span class="cx">     updateViewport();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> Nicosia::CompositionLayerTextureMapperImpl& compositionLayerImpl(Nicosia::CompositionLayer& compositionLayer)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx">     Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx"> 
</span><del>-#ifndef CoordinatedGraphicsScene_h
-#define CoordinatedGraphicsScene_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx"> 
</span><span class="lines">@@ -33,6 +32,7 @@
</span><span class="cx"> #include <WebCore/TextureMapperBackingStore.h>
</span><span class="cx"> #include <WebCore/TextureMapperFPSCounter.h>
</span><span class="cx"> #include <WebCore/TextureMapperLayer.h>
</span><ins>+#include <WebCore/TextureMapperPlatformLayerProxy.h>
</ins><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <wtf/Function.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -41,10 +41,6 @@
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include <WebCore/TextureMapperPlatformLayerProxy.h>
-#endif
-
</del><span class="cx"> namespace Nicosia {
</span><span class="cx"> class Buffer;
</span><span class="cx"> }
</span><span class="lines">@@ -62,11 +58,7 @@
</span><span class="cx">     virtual void updateViewport() = 0;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-class CoordinatedGraphicsScene : public ThreadSafeRefCounted<CoordinatedGraphicsScene>
-#if USE(COORDINATED_GRAPHICS_THREADED)
-    , public WebCore::TextureMapperPlatformLayerProxy::Compositor
-#endif
-{
</del><ins>+class CoordinatedGraphicsScene : public ThreadSafeRefCounted<CoordinatedGraphicsScene>, public WebCore::TextureMapperPlatformLayerProxy::Compositor {
</ins><span class="cx"> public:
</span><span class="cx">     explicit CoordinatedGraphicsScene(CoordinatedGraphicsSceneClient*);
</span><span class="cx">     virtual ~CoordinatedGraphicsScene();
</span><span class="lines">@@ -92,9 +84,7 @@
</span><span class="cx"> 
</span><span class="cx">     void ensureRootLayer();
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><span class="cx">     void onNewBufferAvailable() override;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     struct {
</span><span class="cx">         RefPtr<Nicosia::Scene> scene;
</span><span class="lines">@@ -118,6 +108,4 @@
</span><span class="cx"> 
</span><span class="cx"> #endif // USE(COORDINATED_GRAPHICS)
</span><span class="cx"> 
</span><del>-#endif // CoordinatedGraphicsScene_h
</del><span class="cx"> 
</span><del>-
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsSimpleViewportControllercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SimpleViewportController.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -168,4 +168,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsSimpleViewportControllerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -19,10 +19,9 @@
</span><span class="cx">  * Boston, MA 02110-1301, USA.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef SimpleViewportController_h
-#define SimpleViewportController_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include <WebCore/FloatPoint.h>
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="lines">@@ -76,6 +75,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
-
-#endif // SimpleViewportController_h
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLoopcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CompositingRunLoop.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -212,4 +212,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -23,10 +23,9 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef CompositingRunLoop_h
-#define CompositingRunLoop_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include <wtf/Atomics.h>
</span><span class="cx"> #include <wtf/Condition.h>
</span><span class="lines">@@ -87,6 +86,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
-
-#endif // CompositingRunLoop_h
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ThreadedCompositor.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "CompositingRunLoop.h"
</span><span class="cx"> #include "ThreadedDisplayRefreshMonitor.h"
</span><span class="lines">@@ -331,4 +331,4 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h  2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h     2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "CompositingRunLoop.h"
</span><span class="cx"> #include "CoordinatedGraphicsScene.h"
</span><span class="lines">@@ -125,5 +125,5 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ThreadedDisplayRefreshMonitor.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</del><ins>+#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</ins><span class="cx"> 
</span><span class="cx"> #include "CompositingRunLoop.h"
</span><span class="cx"> #include "ThreadedCompositor.h"
</span><span class="lines">@@ -117,4 +117,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedDisplayRefreshMonitorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include <WebCore/DisplayRefreshMonitor.h>
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</del><ins>+#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -64,4 +64,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageAcceleratedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp       2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp  2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> 
</span><span class="cx"> void AcceleratedDrawingArea::mainFrameContentSizeChanged(const IntSize& size)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     if (m_layerTreeHost)
</span><span class="cx">         m_layerTreeHost->contentsSizeChanged(size);
</span><span class="cx">     else if (m_previousLayerTreeHost)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">         if (!m_layerTreeStateIsFrozen)
</span><span class="cx">             m_layerTreeHost->setLayerFlushSchedulingEnabled(true);
</span><span class="cx">     } else {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">         m_layerTreeHost = std::make_unique<LayerTreeHost>(m_webPage);
</span><span class="cx"> #else
</span><span class="cx">         m_layerTreeHost = nullptr;
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> void AcceleratedDrawingArea::didChangeViewportAttributes(ViewportAttributes&& attrs)
</span><span class="cx"> {
</span><span class="cx">     if (m_layerTreeHost)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageCoordinatedGraphicsLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp    2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp       2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "WebPage.h"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageCoordinatedGraphicsLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h      2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> class WebPage;
</span><span class="cx"> 
</span><span class="cx"> class LayerTreeHost
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     final : public CompositingCoordinator::Client, public AcceleratedSurface::Client
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     void layerFlushTimerFired();
</span><span class="cx">     void didChangeViewport();
</span><span class="cx">     void renderNextFrame(bool);
</span><span class="lines">@@ -171,11 +171,11 @@
</span><span class="cx">         UpdateViewport = 1 << 2,
</span><span class="cx">         UpdateScale = 1 << 3
</span><span class="cx">     };
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> 
</span><span class="cx">     WebPage& m_webPage;
</span><span class="cx">     LayerTreeContext m_layerTreeContext;
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     bool m_layerFlushSchedulingEnabled { true };
</span><span class="cx">     bool m_notifyAfterScheduledLayerFlush { false };
</span><span class="cx">     bool m_isSuspended { false };
</span><span class="lines">@@ -197,10 +197,10 @@
</span><span class="cx">         bool needsFreshFlush { false };
</span><span class="cx">     } m_forceRepaintAsync;
</span><span class="cx">     RunLoop::Timer<LayerTreeHost> m_layerFlushTimer;
</span><del>-#endif // USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#endif // USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> };
</span><span class="cx"> 
</span><del>-#if !USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if !USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> inline LayerTreeHost::LayerTreeHost(WebPage& webPage) : m_webPage(webPage) { }
</span><span class="cx"> inline LayerTreeHost::~LayerTreeHost() { }
</span><span class="cx"> inline void LayerTreeHost::setLayerFlushSchedulingEnabled(bool) { }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp      2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp 2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">     Settings& settings = m_webPage.corePage()->settings();
</span><span class="cx">     settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     // Fixed position elements need to be composited and create stacking contexts
</span><span class="cx">     // in order to be scrolled by the ScrollingCoordinator.
</span><span class="cx">     settings.setAcceleratedCompositingForFixedPositionEnabled(settings.acceleratedCompositingEnabled());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/WebPage.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/WebPage.cpp      2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx">     // This also takes care of the relayout.
</span><span class="cx">     setFixedLayoutSize(roundedIntSize(attr.layoutSize));
</span><span class="cx"> 
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><ins>+#if USE(COORDINATED_GRAPHICS)
</ins><span class="cx">     m_drawingArea->didChangeViewportAttributes(WTFMove(attr));
</span><span class="cx"> #else
</span><span class="cx">     send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
</span><span class="lines">@@ -2000,11 +2000,9 @@
</span><span class="cx">     FrameView* view = m_page->mainFrame().view();
</span><span class="cx">     if (view && view->useFixedLayout())
</span><span class="cx">         sendViewportAttributesChanged(viewportArguments);
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><span class="cx">     else
</span><span class="cx">         m_drawingArea->didChangeViewportAttributes(ViewportAttributes());
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS_FAMILY) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx">     UNUSED_PARAM(viewportArguments);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitWebProcessgtkWebProcessMainGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp        2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp   2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">             g_usleep(30 * G_USEC_PER_SEC);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if (USE(COORDINATED_GRAPHICS_THREADED) || USE(GSTREAMER_GL)) && PLATFORM(X11)
</del><ins>+#if (USE(COORDINATED_GRAPHICS) || USE(GSTREAMER_GL)) && PLATFORM(X11)
</ins><span class="cx">         XInitThreads();
</span><span class="cx"> #endif
</span><span class="cx">         gtk_init(nullptr, nullptr);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsGTK.cmake (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsGTK.cmake     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsGTK.cmake        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -284,7 +284,6 @@
</span><span class="cx">     endif ()
</span><span class="cx"> 
</span><span class="cx">     SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
</span><del>-    SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
</del><span class="cx">     SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
</span><span class="cx"> endif ()
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourcecmakeOptionsPlayStationcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsPlayStation.cmake (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsPlayStation.cmake     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsPlayStation.cmake        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> # Rendering options
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D ON)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ON)
</span><del>-SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ON)
</del><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_EGL ON)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES ON)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourcecmakeOptionsWPEcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake (243980 => 243981)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake     2019-04-08 10:14:39 UTC (rev 243980)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake        2019-04-08 10:14:55 UTC (rev 243981)
</span><span class="lines">@@ -165,7 +165,6 @@
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE TRUE)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
</span><del>-SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
</del><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
</span><span class="cx"> 
</span><span class="cx"> # Override the cached variable, gtk-doc does not really work when cross-building or building on Mac.
</span></span></pre>
</div>
</div>

</body>
</html>