Diff
Modified: trunk/ChangeLog (242204 => 242205)
--- trunk/ChangeLog 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/ChangeLog 2019-02-28 18:28:01 UTC (rev 242205)
@@ -1,3 +1,14 @@
+2019-02-28 Carlos Garcia Campos <cgar...@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:
+
2019-02-26 Gabe Giosia <gio...@google.com>
Incorrect formatting around command in Readme.md
Modified: trunk/Source/WebCore/ChangeLog (242204 => 242205)
--- trunk/Source/WebCore/ChangeLog 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/ChangeLog 2019-02-28 18:28:01 UTC (rev 242205)
@@ -1,3 +1,49 @@
+2019-02-28 Carlos Garcia Campos <cgar...@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):
+
2019-02-28 Myles C. Maxfield <mmaxfi...@apple.com>
Locale names can be nullptr
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -1436,7 +1436,7 @@
GC3Duint m_texture { 0 };
GC3Duint m_fbo { 0 };
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
GC3Duint m_compositorTexture { 0 };
GC3Duint m_intermediateTexture { 0 };
#endif
Modified: trunk/Source/WebCore/platform/graphics/PlatformLayer.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/PlatformLayer.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -35,7 +35,7 @@
class PlatformLayer;
}
typedef Nicosia::PlatformLayer PlatformLayer;
-#elif USE(COORDINATED_GRAPHICS_THREADED)
+#elif USE(COORDINATED_GRAPHICS)
namespace WebCore {
class TextureMapperPlatformLayerProxyProvider;
typedef TextureMapperPlatformLayerProxyProvider PlatformLayer;
Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -69,7 +69,7 @@
#include "OpenGLShims.h"
#endif
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "TextureMapperPlatformLayerBuffer.h"
#include "TextureMapperPlatformLayerProxy.h"
#endif
@@ -83,13 +83,13 @@
, m_size(size)
, m_renderingMode(renderingMode)
#if ENABLE(ACCELERATED_2D_CANVAS)
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
, m_compositorTexture(0)
#endif
, m_texture(0)
#endif
{
-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS_THREADED)
+#if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS)
if (m_renderingMode == RenderingMode::Accelerated) {
#if USE(NICOSIA)
m_nicosiaLayer = Nicosia::ContentLayer::create(Nicosia::ContentLayerTextureMapperImpl::createFactory(*this));
@@ -106,7 +106,7 @@
return;
#if ENABLE(ACCELERATED_2D_CANVAS)
-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).invalidateClient();
#endif
@@ -116,7 +116,7 @@
if (m_texture)
glDeleteTextures(1, &m_texture);
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
if (m_compositorTexture)
glDeleteTextures(1, &m_compositorTexture);
#endif
@@ -127,7 +127,7 @@
}
#if ENABLE(ACCELERATED_2D_CANVAS)
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
void ImageBufferData::createCompositorBuffer()
{
auto* context = PlatformDisplay::sharedDisplayForCompositing().sharingGLContext();
@@ -674,7 +674,7 @@
#endif
-#if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS_THREADED)
+#if ENABLE(ACCELERATED_2D_CANVAS) && !USE(COORDINATED_GRAPHICS)
void ImageBufferData::paintToTextureMapper(TextureMapper& textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
{
ASSERT(m_texture);
Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -69,7 +69,7 @@
#if ENABLE(ACCELERATED_2D_CANVAS)
void createCairoGLSurface();
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#if USE(NICOSIA)
void swapBuffersIfNeeded() override;
#else
Modified: trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -29,7 +29,7 @@
#include "config.h"
#include "NicosiaPaintingEngineThreaded.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
@@ -89,4 +89,4 @@
} // namespace Nicosia
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -28,7 +28,7 @@
#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "NicosiaPaintingEngine.h"
#include <wtf/WorkerPool.h>
@@ -48,4 +48,4 @@
} // namespace Nicosia
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -31,7 +31,7 @@
#if USE(NICOSIA) && USE(TEXTURE_MAPPER)
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "TextureMapperGL.h"
#include "TextureMapperPlatformLayerBuffer.h"
#include "TextureMapperPlatformLayerProxy.h"
@@ -76,7 +76,7 @@
void GC3DLayer::swapBuffersIfNeeded()
{
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
if (m_context.layerComposited())
return;
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -196,7 +196,7 @@
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
::glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_texture, 0);
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
if (m_compositorTexture) {
::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -226,7 +226,7 @@
makeContextCurrent();
-#if !USE(COORDINATED_GRAPHICS_THREADED)
+#if !USE(COORDINATED_GRAPHICS)
TemporaryOpenGLSetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
TemporaryOpenGLSetting scopedDither(GL_DITHER, GL_FALSE);
#endif
@@ -234,7 +234,7 @@
if (m_attrs.antialias)
resolveMultisamplingIfNecessary();
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
std::swap(m_texture, m_compositorTexture);
std::swap(m_texture, m_intermediateTexture);
::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -110,7 +110,7 @@
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, pixelDataType, 0);
::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
if (m_compositorTexture) {
::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -133,7 +133,7 @@
::glGenFramebuffers(1, &m_fbo);
::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
::glGenTextures(1, &m_compositorTexture);
::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
::glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -235,7 +235,7 @@
makeContextCurrent();
if (m_texture)
::glDeleteTextures(1, &m_texture);
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
if (m_compositorTexture)
::glDeleteTextures(1, &m_compositorTexture);
#endif
@@ -257,7 +257,7 @@
::glDeleteRenderbuffers(1, &m_depthStencilBuffer);
}
::glDeleteFramebuffers(1, &m_fbo);
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
::glDeleteTextures(1, &m_intermediateTexture);
#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -42,7 +42,7 @@
break;
}
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
m_platformLayerProxy = adoptRef(new TextureMapperPlatformLayerProxy());
#endif
}
@@ -49,7 +49,7 @@
TextureMapperGC3DPlatformLayer::~TextureMapperGC3DPlatformLayer()
{
-#if !USE(COORDINATED_GRAPHICS_THREADED)
+#if !USE(COORDINATED_GRAPHICS)
if (client())
client()->platformLayerWillBeDestroyed();
#endif
@@ -67,7 +67,7 @@
return m_glContext->platformContext();
}
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
RefPtr<TextureMapperPlatformLayerProxy> TextureMapperGC3DPlatformLayer::proxy() const
{
return m_platformLayerProxy.copyRef();
@@ -115,7 +115,7 @@
texmapGL.drawTexture(m_context.m_texture, flags, textureSize, targetRect, matrix, opacity);
#endif // USE(TEXTURE_MAPPER_GL)
}
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -39,7 +39,7 @@
bool makeContextCurrent();
PlatformGraphicsContext3D platformContext();
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
RefPtr<TextureMapperPlatformLayerProxy> proxy() const override;
void swapBuffersIfNeeded() override;
#else
@@ -50,7 +50,7 @@
GraphicsContext3D& m_context;
std::unique_ptr<GLContext> m_glContext;
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
RefPtr<TextureMapperPlatformLayerProxy> m_platformLayerProxy;
#endif
};
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -26,7 +26,7 @@
#include "config.h"
#include "TextureMapperPlatformLayerBuffer.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "FloatRect.h"
#include "NotImplemented.h"
@@ -92,4 +92,4 @@
} // namespace WebCore
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "BitmapTextureGL.h"
#include "TextureMapperGLHeaders.h"
@@ -88,4 +88,4 @@
} // namespace WebCore
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -26,7 +26,7 @@
#include "config.h"
#include "TextureMapperPlatformLayerProxy.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "BitmapTextureGL.h"
#include "TextureMapperGL.h"
@@ -243,4 +243,4 @@
} // namespace WebCore
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TextureMapperPlatformLayerProxy_h
-#define TextureMapperPlatformLayerProxy_h
+#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "TextureMapperGLHeaders.h"
#include <wtf/Function.h>
@@ -100,6 +99,4 @@
} // namespace WebCore
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
-
-#endif // TextureMapperPlatformLayerProxy_h
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxyProvider.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
namespace WebCore {
@@ -39,4 +39,4 @@
} // namespace WebCore
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (242204 => 242205)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -395,7 +395,7 @@
void CoordinatedGraphicsLayer::setContentsNeedsDisplay()
{
-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
if (m_nicosia.contentLayer)
m_shouldUpdatePlatformLayer = true;
#endif
@@ -406,7 +406,7 @@
void CoordinatedGraphicsLayer::setContentsToPlatformLayer(PlatformLayer* platformLayer, ContentsLayerPurpose)
{
-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
auto* contentLayer = downcast<Nicosia::ContentLayer>(platformLayer);
if (m_nicosia.contentLayer != contentLayer) {
m_nicosia.contentLayer = contentLayer;
@@ -616,7 +616,7 @@
return;
m_shouldUpdatePlatformLayer = false;
-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(NICOSIA)
+#if USE(COORDINATED_GRAPHICS) && USE(NICOSIA)
if (m_nicosia.contentLayer)
downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosia.contentLayer->impl()).swapBuffersIfNeeded();
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (242204 => 242205)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -2401,7 +2401,7 @@
bool RenderLayerBacking::paintsIntoWindow() const
{
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
return false;
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (242204 => 242205)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -3063,7 +3063,7 @@
if (m_overflowControlsHostLayer && isMainFrameCompositor())
return true;
-#if !USE(COORDINATED_GRAPHICS_THREADED)
+#if !USE(COORDINATED_GRAPHICS)
if (!frameView.hasOverlayScrollbars())
return false;
#endif
Modified: trunk/Source/WebKit/ChangeLog (242204 => 242205)
--- trunk/Source/WebKit/ChangeLog 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/ChangeLog 2019-02-28 18:28:01 UTC (rev 242205)
@@ -1,3 +1,35 @@
+2019-02-28 Carlos Garcia Campos <cgar...@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.
+
+ * 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 Sihui Liu <sihui_...@apple.com>
Stop using legacy IDB path by default when creating WebProcessPool from websiteDataStore
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -96,12 +96,10 @@
m_client->updateViewport();
}
-#if USE(COORDINATED_GRAPHICS_THREADED)
void CoordinatedGraphicsScene::onNewBufferAvailable()
{
updateViewport();
}
-#endif
Nicosia::CompositionLayerTextureMapperImpl& compositionLayerImpl(Nicosia::CompositionLayer& compositionLayer)
{
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -18,8 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef CoordinatedGraphicsScene_h
-#define CoordinatedGraphicsScene_h
+#pragma once
#if USE(COORDINATED_GRAPHICS)
@@ -33,6 +32,7 @@
#include <WebCore/TextureMapperBackingStore.h>
#include <WebCore/TextureMapperFPSCounter.h>
#include <WebCore/TextureMapperLayer.h>
+#include <WebCore/TextureMapperPlatformLayerProxy.h>
#include <WebCore/Timer.h>
#include <wtf/Function.h>
#include <wtf/HashSet.h>
@@ -41,10 +41,6 @@
#include <wtf/ThreadingPrimitives.h>
#include <wtf/Vector.h>
-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include <WebCore/TextureMapperPlatformLayerProxy.h>
-#endif
-
namespace Nicosia {
class Buffer;
}
@@ -62,11 +58,7 @@
virtual void updateViewport() = 0;
};
-class CoordinatedGraphicsScene : public ThreadSafeRefCounted<CoordinatedGraphicsScene>
-#if USE(COORDINATED_GRAPHICS_THREADED)
- , public WebCore::TextureMapperPlatformLayerProxy::Compositor
-#endif
-{
+class CoordinatedGraphicsScene : public ThreadSafeRefCounted<CoordinatedGraphicsScene>, public WebCore::TextureMapperPlatformLayerProxy::Compositor {
public:
explicit CoordinatedGraphicsScene(CoordinatedGraphicsSceneClient*);
virtual ~CoordinatedGraphicsScene();
@@ -92,9 +84,7 @@
void ensureRootLayer();
-#if USE(COORDINATED_GRAPHICS_THREADED)
void onNewBufferAvailable() override;
-#endif
struct {
RefPtr<Nicosia::Scene> scene;
@@ -118,6 +108,4 @@
#endif // USE(COORDINATED_GRAPHICS)
-#endif // CoordinatedGraphicsScene_h
-
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -22,7 +22,7 @@
#include "config.h"
#include "SimpleViewportController.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
namespace WebKit {
using namespace WebCore;
@@ -168,4 +168,4 @@
} // namespace WebCore
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/SimpleViewportController.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -19,10 +19,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SimpleViewportController_h
-#define SimpleViewportController_h
+#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include <WebCore/FloatPoint.h>
#include <WebCore/FloatRect.h>
@@ -76,6 +75,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
-
-#endif // SimpleViewportController_h
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -26,7 +26,7 @@
#include "config.h"
#include "CompositingRunLoop.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include <wtf/HashMap.h>
#include <wtf/MainThread.h>
@@ -260,4 +260,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CompositingRunLoop_h
-#define CompositingRunLoop_h
+#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include <wtf/Atomics.h>
#include <wtf/Condition.h>
@@ -87,6 +86,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
-
-#endif // CompositingRunLoop_h
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ThreadedCompositor.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "CompositingRunLoop.h"
#include "ThreadedDisplayRefreshMonitor.h"
@@ -331,4 +331,4 @@
}
}
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "CompositingRunLoop.h"
#include "CoordinatedGraphicsScene.h"
@@ -125,5 +125,5 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ThreadedDisplayRefreshMonitor.h"
-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
#include "CompositingRunLoop.h"
#include "ThreadedCompositor.h"
@@ -117,4 +117,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h (242204 => 242205)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -27,7 +27,7 @@
#include <WebCore/DisplayRefreshMonitor.h>
-#if USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
#include <wtf/RunLoop.h>
namespace WebKit {
@@ -64,4 +64,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp (242204 => 242205)
--- trunk/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -135,7 +135,7 @@
void AcceleratedDrawingArea::mainFrameContentSizeChanged(const IntSize& size)
{
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
if (m_layerTreeHost)
m_layerTreeHost->contentsSizeChanged(size);
else if (m_previousLayerTreeHost)
@@ -332,7 +332,7 @@
if (!m_layerTreeStateIsFrozen)
m_layerTreeHost->setLayerFlushSchedulingEnabled(true);
} else {
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
m_layerTreeHost = std::make_unique<LayerTreeHost>(m_webPage);
#else
m_layerTreeHost = nullptr;
@@ -410,7 +410,7 @@
}
#endif
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
void AcceleratedDrawingArea::didChangeViewportAttributes(ViewportAttributes&& attrs)
{
if (m_layerTreeHost)
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp (242204 => 242205)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -29,7 +29,7 @@
#include "config.h"
#include "LayerTreeHost.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
#include "DrawingArea.h"
#include "WebPage.h"
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h (242204 => 242205)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2019-02-28 18:28:01 UTC (rev 242205)
@@ -53,7 +53,7 @@
class WebPage;
class LayerTreeHost
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
final : public CompositingCoordinator::Client, public AcceleratedSurface::Client
#endif
{
@@ -98,7 +98,7 @@
#endif
private:
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
void layerFlushTimerFired();
void didChangeViewport();
void renderNextFrame(bool);
@@ -171,11 +171,11 @@
UpdateViewport = 1 << 2,
UpdateScale = 1 << 3
};
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
WebPage& m_webPage;
LayerTreeContext m_layerTreeContext;
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
bool m_layerFlushSchedulingEnabled { true };
bool m_notifyAfterScheduledLayerFlush { false };
bool m_isSuspended { false };
@@ -197,10 +197,10 @@
bool needsFreshFlush { false };
} m_forceRepaintAsync;
RunLoop::Timer<LayerTreeHost> m_layerFlushTimer;
-#endif // USE(COORDINATED_GRAPHICS_THREADED)
+#endif // USE(COORDINATED_GRAPHICS)
};
-#if !USE(COORDINATED_GRAPHICS_THREADED)
+#if !USE(COORDINATED_GRAPHICS)
inline LayerTreeHost::LayerTreeHost(WebPage& webPage) : m_webPage(webPage) { }
inline LayerTreeHost::~LayerTreeHost() { }
inline void LayerTreeHost::setLayerFlushSchedulingEnabled(bool) { }
Modified: trunk/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp (242204 => 242205)
--- trunk/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/WebProcess/WebPage/DrawingAreaImpl.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -171,7 +171,7 @@
Settings& settings = m_webPage.corePage()->settings();
settings.setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
// Fixed position elements need to be composited and create stacking contexts
// in order to be scrolled by the ScrollingCoordinator.
settings.setAcceleratedCompositingForFixedPositionEnabled(settings.acceleratedCompositingEnabled());
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (242204 => 242205)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -1621,7 +1621,7 @@
// This also takes care of the relayout.
setFixedLayoutSize(roundedIntSize(attr.layoutSize));
-#if USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(COORDINATED_GRAPHICS)
m_drawingArea->didChangeViewportAttributes(WTFMove(attr));
#else
send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
@@ -2015,11 +2015,9 @@
FrameView* view = m_page->mainFrame().view();
if (view && view->useFixedLayout())
sendViewportAttributesChanged(viewportArguments);
-#if USE(COORDINATED_GRAPHICS_THREADED)
else
m_drawingArea->didChangeViewportAttributes(ViewportAttributes());
#endif
-#endif
#if !PLATFORM(IOS_FAMILY) && !USE(COORDINATED_GRAPHICS)
UNUSED_PARAM(viewportArguments);
Modified: trunk/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp (242204 => 242205)
--- trunk/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp 2019-02-28 18:28:01 UTC (rev 242205)
@@ -50,7 +50,7 @@
g_usleep(30 * G_USEC_PER_SEC);
#endif
-#if (USE(COORDINATED_GRAPHICS_THREADED) || USE(GSTREAMER_GL)) && PLATFORM(X11)
+#if (USE(COORDINATED_GRAPHICS) || USE(GSTREAMER_GL)) && PLATFORM(X11)
XInitThreads();
#endif
gtk_init(nullptr, nullptr);
Modified: trunk/Source/cmake/OptionsGTK.cmake (242204 => 242205)
--- trunk/Source/cmake/OptionsGTK.cmake 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/cmake/OptionsGTK.cmake 2019-02-28 18:28:01 UTC (rev 242205)
@@ -322,7 +322,6 @@
endif ()
SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
- SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
endif ()
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (242204 => 242205)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2019-02-28 18:28:01 UTC (rev 242205)
@@ -113,7 +113,6 @@
# Rendering options
SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D ON)
SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ON)
-SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ON)
SET_AND_EXPOSE_TO_BUILD(USE_EGL ON)
SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES ON)
Modified: trunk/Source/cmake/OptionsWPE.cmake (242204 => 242205)
--- trunk/Source/cmake/OptionsWPE.cmake 2019-02-28 18:22:34 UTC (rev 242204)
+++ trunk/Source/cmake/OptionsWPE.cmake 2019-02-28 18:28:01 UTC (rev 242205)
@@ -165,7 +165,6 @@
SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
-SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
# Override the cached variable, gtk-doc does not really work when cross-building or building on Mac.
