Delete QSG video node classes

Leftovers from deleting old compositor.

Change-Id: I9eb5a707f594f2355512ad2c585efc0a1ee3720a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 2 insertions, 732 deletions

diff --git a/src/core/compositor/stream_video_node.cpp b/src/core/compositor/stream_video_node.cpp
deleted file mode 100644
index fb9501f24..000000000
--- a/src/core/compositor/stream_video_node.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "stream_video_node.h"
-
-#include <QtQuick/qsgtexture.h>
-
-namespace QtWebEngineCore {
-
-class StreamVideoMaterialShader : public QSGMaterialShader
-{
-public:
-    StreamVideoMaterialShader(TextureTarget target) : m_target(target) { }
-    virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
-
-    char const *const *attributeNames() const override {
-        static const char *names[] = {
-            "a_position",
-            "a_texCoord",
-            0
-        };
-        return names;
-    }
-
-protected:
-    const char *vertexShader() const override {
-        // Keep in sync with cc::VertexShaderVideoTransform
-        static const char *shader =
-        "attribute highp vec4 a_position;\n"
-        "attribute mediump vec2 a_texCoord;\n"
-        "uniform highp mat4 matrix;\n"
-        "uniform highp mat4 texMatrix;\n"
-        "varying mediump vec2 v_texCoord;\n"
-        "void main() {\n"
-        "  gl_Position = matrix * a_position;\n"
-        "  v_texCoord = vec4(texMatrix * vec4(a_texCoord.x, 1.0 - a_texCoord.y, 0.0, 1.0)).xy;\n"
-        "}";
-        return shader;
-    }
-
-    const char *fragmentShader() const override {
-        // Keep in sync with cc::FragmentShaderRGBATexAlpha
-        static const char *shaderExternal  =
-        "#extension GL_OES_EGL_image_external : require\n"
-        "varying mediump vec2 v_texCoord;\n"
-        "uniform samplerExternalOES s_texture;\n"
-        "uniform lowp float alpha;\n"
-        "void main() {\n"
-        "  lowp vec4 texColor = texture2D(s_texture, v_texCoord);\n"
-        "  gl_FragColor = texColor * alpha;\n"
-        "}";
-        static const char *shader2DRect =
-        "#extension GL_ARB_texture_rectangle : require\n"
-        "varying mediump vec2 v_texCoord;\n"
-        "uniform sampler2DRect s_texture;\n"
-        "uniform lowp float alpha;\n"
-        "void main() {\n"
-        "  lowp vec4 texColor = texture2DRect(s_texture, v_texCoord);\n"
-        "  gl_FragColor = texColor * alpha;\n"
-        "}";
-        if (m_target == ExternalTarget)
-            return shaderExternal;
-        else
-            return shader2DRect;
-    }
-
-    virtual void initialize() override {
-        m_id_matrix = program()->uniformLocation("matrix");
-        m_id_sTexture = program()->uniformLocation("s_texture");
-        m_id_texMatrix = program()->uniformLocation("texMatrix");
-        m_id_opacity = program()->uniformLocation("alpha");
-    }
-
-    int m_id_matrix;
-    int m_id_texMatrix;
-    int m_id_sTexture;
-    int m_id_opacity;
-    TextureTarget m_target;
-};
-
-void StreamVideoMaterialShader::updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial)
-{
-    Q_UNUSED(oldMaterial);
-
-    StreamVideoMaterial *mat = static_cast<StreamVideoMaterial *>(newMaterial);
-    program()->setUniformValue(m_id_sTexture, 0);
-
-    mat->m_texture->bind();
-
-    if (state.isOpacityDirty())
-        program()->setUniformValue(m_id_opacity, state.opacity());
-
-    if (state.isMatrixDirty())
-        program()->setUniformValue(m_id_matrix, state.combinedMatrix());
-
-    program()->setUniformValue(m_id_texMatrix, mat->m_texMatrix);
-}
-
-StreamVideoMaterial::StreamVideoMaterial(QSGTexture *texture, TextureTarget target)
-    : m_texture(texture)
-    , m_target(target)
-{
-}
-
-QSGMaterialShader *StreamVideoMaterial::createShader() const
-{
-    return new StreamVideoMaterialShader(m_target);
-}
-
-StreamVideoNode::StreamVideoNode(QSGTexture *texture, bool flip, TextureTarget target)
-    : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
-    , m_flip(flip)
-{
-    setGeometry(&m_geometry);
-    setFlag(QSGNode::OwnsMaterial);
-    m_material = new StreamVideoMaterial(texture, target);
-    setMaterial(m_material);
-}
-
-void StreamVideoNode::setRect(const QRectF &rect)
-{
-    if (m_flip)
-        QSGGeometry::updateTexturedRectGeometry(geometry(), rect, QRectF(0, 1, 1, -1));
-    else
-        QSGGeometry::updateTexturedRectGeometry(geometry(), rect, QRectF(0, 0, 1, 1));
-}
-
-void StreamVideoNode::setTextureMatrix(const QMatrix4x4 &matrix)
-{
-    m_material->m_texMatrix = matrix;
-}
-
-} // namespace
diff --git a/src/core/compositor/stream_video_node.h b/src/core/compositor/stream_video_node.h
deleted file mode 100644
index 9d937791f..000000000
--- a/src/core/compositor/stream_video_node.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef STREAM_VIDEO_NODE_H
-#define STREAM_VIDEO_NODE_H
-
-#include <QtQuick/qsgmaterial.h>
-#include <QtQuick/qsgnode.h>
-
-QT_FORWARD_DECLARE_CLASS(QSGTexture)
-
-namespace QtWebEngineCore {
-
-// These classes duplicate, QtQuick style, the logic of GLRenderer::DrawStreamVideoQuad.
-// Their behavior should stay as close as possible to GLRenderer.
-
-enum TextureTarget { ExternalTarget, RectangleTarget };
-
-class StreamVideoMaterial : public QSGMaterial
-{
-public:
-    StreamVideoMaterial(QSGTexture *texture, TextureTarget target);
-
-    QSGMaterialType *type() const override
-    {
-        static QSGMaterialType theType;
-        return &theType;
-    }
-
-    QSGMaterialShader *createShader() const override;
-
-    QSGTexture *m_texture;
-    QMatrix4x4 m_texMatrix;
-    TextureTarget m_target;
-};
-
-class StreamVideoNode : public QSGGeometryNode
-{
-public:
-    StreamVideoNode(QSGTexture *texture, bool flip, TextureTarget target);
-    void setRect(const QRectF &rect);
-    void setTextureMatrix(const QMatrix4x4 &matrix);
-
-private:
-    QSGGeometry m_geometry;
-    bool m_flip;
-    StreamVideoMaterial *m_material;
-};
-
-} // namespace
-
-#endif // STREAM_VIDEO_NODE_H
diff --git a/src/core/compositor/yuv_video_node.cpp b/src/core/compositor/yuv_video_node.cpp
deleted file mode 100644
index 4a436d952..000000000
--- a/src/core/compositor/yuv_video_node.cpp
+++ /dev/null
@@ -1,352 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on cc/output/gl_renderer.cc and cc/output/shader.cc:
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.Chromium file.
-
-#include "yuv_video_node.h"
-
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qopenglfunctions.h>
-#include <QtQuick/qsgtexture.h>
-
-#include "ui/gfx/color_space.h"
-#include "ui/gfx/color_transform.h"
-
-namespace QtWebEngineCore {
-
-class YUVVideoMaterialShader : public QSGMaterialShader
-{
-public:
-    YUVVideoMaterialShader(const gfx::ColorSpace &colorSpace)
-    {
-        static const char *shaderHead =
-            "varying mediump vec2 v_yaTexCoord;\n"
-            "varying mediump vec2 v_uvTexCoord;\n"
-            "uniform sampler2D y_texture;\n"
-            "uniform sampler2D u_texture;\n"
-            "uniform sampler2D v_texture;\n"
-            "uniform mediump float alpha;\n"
-            "uniform mediump vec4 ya_clamp_rect;\n"
-            "uniform mediump vec4 uv_clamp_rect;\n";
-        static const char *shader =
-            "void main() {\n"
-            "  mediump vec2 ya_clamped =\n"
-            "      max(ya_clamp_rect.xy, min(ya_clamp_rect.zw, v_yaTexCoord));\n"
-            "  mediump float y_raw = texture2D(y_texture, ya_clamped).x;\n"
-            "  mediump vec2 uv_clamped =\n"
-            "      max(uv_clamp_rect.xy, min(uv_clamp_rect.zw, v_uvTexCoord));\n"
-            "  mediump float u_unsigned = texture2D(u_texture, uv_clamped).x;\n"
-            "  mediump float v_unsigned = texture2D(v_texture, uv_clamped).x;\n"
-            "  mediump vec3 yuv = vec3(y_raw, u_unsigned, v_unsigned);\n"
-            "  mediump vec3 rgb = DoColorConversion(yuv);\n"
-            "  gl_FragColor = vec4(rgb, 1.0) * alpha;\n"
-            "}";
-        // Invalid or unspecified color spaces should be treated as REC709.
-        gfx::ColorSpace src = colorSpace.IsValid() ? colorSpace : gfx::ColorSpace::CreateREC709();
-        gfx::ColorSpace dst = gfx::ColorSpace::CreateSRGB();
-        std::unique_ptr<gfx::ColorTransform> transform =
-                gfx::ColorTransform::NewColorTransform(src, dst, gfx::ColorTransform::Intent::INTENT_PERCEPTUAL);
-
-        QByteArray header(shaderHead);
-        if (QOpenGLContext::currentContext()->isOpenGLES())
-            header = QByteArray("precision mediump float;\n") + header;
-
-        m_csShader = QByteArray::fromStdString(transform->GetShaderSource());
-        m_fragmentShader = header + m_csShader + QByteArray(shader);
-    }
-    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
-
-    char const *const *attributeNames() const override {
-        static const char *names[] = {
-            "a_position",
-            "a_texCoord",
-            0
-        };
-        return names;
-    }
-
-protected:
-    const char *vertexShader() const override {
-        // Keep in sync with logic in VertexShader in components/viz/service/display/shader.cc
-        const char *shader =
-        "attribute highp vec4 a_position;\n"
-        "attribute mediump vec2 a_texCoord;\n"
-        "uniform highp mat4 matrix;\n"
-        "varying mediump vec2 v_yaTexCoord;\n"
-        "varying mediump vec2 v_uvTexCoord;\n"
-        "uniform mediump vec2 yaTexScale;\n"
-        "uniform mediump vec2 yaTexOffset;\n"
-        "uniform mediump vec2 uvTexScale;\n"
-        "uniform mediump vec2 uvTexOffset;\n"
-        "void main() {\n"
-        "  gl_Position = matrix * a_position;\n"
-        "  v_yaTexCoord = a_texCoord * yaTexScale + yaTexOffset;\n"
-        "  v_uvTexCoord = a_texCoord * uvTexScale + uvTexOffset;\n"
-        "}";
-        return shader;
-    }
-
-    const char *fragmentShader() const override {
-        return m_fragmentShader.constData();
-    }
-
-    void initialize() override {
-        m_id_matrix = program()->uniformLocation("matrix");
-        m_id_yaTexScale = program()->uniformLocation("yaTexScale");
-        m_id_uvTexScale = program()->uniformLocation("uvTexScale");
-        m_id_yaTexOffset = program()->uniformLocation("yaTexOffset");
-        m_id_uvTexOffset = program()->uniformLocation("uvTexOffset");
-        m_id_yaClampRect = program()->uniformLocation("ya_clamp_rect");
-        m_id_uvClampRect = program()->uniformLocation("uv_clamp_rect");
-        m_id_yTexture = program()->uniformLocation("y_texture");
-        m_id_uTexture = program()->uniformLocation("u_texture");
-        m_id_vTexture = program()->uniformLocation("v_texture");
-        m_id_yuvMatrix = program()->uniformLocation("yuv_matrix");
-        m_id_yuvAdjust = program()->uniformLocation("yuv_adj");
-        m_id_opacity = program()->uniformLocation("alpha");
-    }
-
-    int m_id_matrix;
-    int m_id_yaTexScale;
-    int m_id_uvTexScale;
-    int m_id_yaTexOffset;
-    int m_id_uvTexOffset;
-    int m_id_yaClampRect;
-    int m_id_uvClampRect;
-    int m_id_yTexture;
-    int m_id_uTexture;
-    int m_id_vTexture;
-    int m_id_yuvMatrix;
-    int m_id_yuvAdjust;
-    int m_id_opacity;
-    QByteArray m_csShader;
-    QByteArray m_fragmentShader;
-};
-
-class YUVAVideoMaterialShader : public YUVVideoMaterialShader
-{
-public:
-    YUVAVideoMaterialShader(const gfx::ColorSpace &colorSpace) : YUVVideoMaterialShader(colorSpace)
-    {
-        static const char *shaderHead =
-            "varying mediump vec2 v_yaTexCoord;\n"
-            "varying mediump vec2 v_uvTexCoord;\n"
-            "uniform sampler2D y_texture;\n"
-            "uniform sampler2D u_texture;\n"
-            "uniform sampler2D v_texture;\n"
-            "uniform sampler2D a_texture;\n"
-            "uniform mediump float alpha;\n"
-            "uniform mediump vec4 ya_clamp_rect;\n"
-            "uniform mediump vec4 uv_clamp_rect;\n";
-        static const char *shader =
-            "void main() {\n"
-            "  mediump vec2 ya_clamped =\n"
-            "      max(ya_clamp_rect.xy, min(ya_clamp_rect.zw, v_yaTexCoord));\n"
-            "  mediump float y_raw = texture2D(y_texture, ya_clamped).x;\n"
-            "  mediump vec2 uv_clamped =\n"
-            "      max(uv_clamp_rect.xy, min(uv_clamp_rect.zw, v_uvTexCoord));\n"
-            "  mediump float u_unsigned = texture2D(u_texture, uv_clamped).x;\n"
-            "  mediump float v_unsigned = texture2D(v_texture, uv_clamped).x;\n"
-            "  mediump float a_raw = texture2D(a_texture, ya_clamped).x;\n"
-            "  mediump vec3 yuv = vec3(y_raw, u_unsigned, v_unsigned);\n"
-            "  mediump vec3 rgb = DoColorConversion(yuv);\n"
-            "  gl_FragColor = vec4(rgb, 1.0) * (alpha * a_raw);\n"
-            "}";
-        QByteArray header(shaderHead);
-        if (QOpenGLContext::currentContext()->isOpenGLES())
-            header = QByteArray("precision mediump float;\n") + header;
-        m_fragmentShader = header + m_csShader + QByteArray(shader);
-    }
-    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
-
-protected:
-    void initialize() override {
-        // YUVVideoMaterialShader has a subset of the uniforms.
-        YUVVideoMaterialShader::initialize();
-        m_id_aTexture = program()->uniformLocation("a_texture");
-    }
-
-    int m_id_aTexture;
-};
-
-void YUVVideoMaterialShader::updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial)
-{
-    Q_UNUSED(oldMaterial);
-
-    // Keep logic in sync with logic in GLRenderer::DrawYUVVideoQuad:
-
-    YUVVideoMaterial *mat = static_cast<YUVVideoMaterial *>(newMaterial);
-    program()->setUniformValue(m_id_yTexture, 0);
-    program()->setUniformValue(m_id_uTexture, 1);
-    program()->setUniformValue(m_id_vTexture, 2);
-
-    QOpenGLFunctions glFuncs(QOpenGLContext::currentContext());
-
-    glFuncs.glActiveTexture(GL_TEXTURE1);
-    mat->m_uTexture->bind();
-    glFuncs.glActiveTexture(GL_TEXTURE2);
-    mat->m_vTexture->bind();
-    glFuncs.glActiveTexture(GL_TEXTURE0); // Finish with 0 as default texture unit
-    mat->m_yTexture->bind();
-
-    const QSizeF yaSizeScale(1.0f / mat->m_yaTexSize.width(), 1.0f / mat->m_yaTexSize.height());
-    const QSizeF uvSizeScale(1.0f / mat->m_uvTexSize.width(), 1.0f / mat->m_uvTexSize.height());
-
-    const QPointF yaTexOffset(mat->m_yaTexCoordRect.left() * yaSizeScale.width(), mat->m_yaTexCoordRect.top() * yaSizeScale.height());
-    const QPointF uvTexOffset(mat->m_uvTexCoordRect.left() * uvSizeScale.width(), mat->m_uvTexCoordRect.top() * uvSizeScale.height());
-    const QSizeF yaTexScale(mat->m_yaTexCoordRect.width() * yaSizeScale.width(), mat->m_yaTexCoordRect.height() * yaSizeScale.height());
-    const QSizeF uvTexScale(mat->m_uvTexCoordRect.width() * uvSizeScale.width(), mat->m_uvTexCoordRect.height() * uvSizeScale.height());
-    program()->setUniformValue(m_id_yaTexOffset, yaTexOffset);
-    program()->setUniformValue(m_id_uvTexOffset, uvTexOffset);
-    program()->setUniformValue(m_id_yaTexScale, yaTexScale);
-    program()->setUniformValue(m_id_uvTexScale, uvTexScale);
-    QRectF yaClampRect(yaTexOffset, yaTexScale);
-    QRectF uvClampRect(uvTexOffset, uvTexScale);
-    yaClampRect = yaClampRect.marginsRemoved(QMarginsF(yaSizeScale.width() * 0.5f, yaSizeScale.height() * 0.5f,
-                                                       yaSizeScale.width() * 0.5f, yaSizeScale.height() * 0.5f));
-    uvClampRect = uvClampRect.marginsRemoved(QMarginsF(uvSizeScale.width() * 0.5f, uvSizeScale.height() * 0.5f,
-                                                       uvSizeScale.width() * 0.5f, uvSizeScale.height() * 0.5f));
-
-    const QVector4D yaClampV(yaClampRect.left(), yaClampRect.top(), yaClampRect.right(), yaClampRect.bottom());
-    const QVector4D uvClampV(uvClampRect.left(), uvClampRect.top(), uvClampRect.right(), uvClampRect.bottom());
-    program()->setUniformValue(m_id_yaClampRect, yaClampV);
-    program()->setUniformValue(m_id_uvClampRect, uvClampV);
-
-    if (state.isOpacityDirty())
-        program()->setUniformValue(m_id_opacity, state.opacity());
-
-    if (state.isMatrixDirty())
-        program()->setUniformValue(m_id_matrix, state.combinedMatrix());
-}
-
-void YUVAVideoMaterialShader::updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial)
-{
-    YUVVideoMaterialShader::updateState(state, newMaterial, oldMaterial);
-
-    YUVAVideoMaterial *mat = static_cast<YUVAVideoMaterial *>(newMaterial);
-    program()->setUniformValue(m_id_aTexture, 3);
-
-    QOpenGLFunctions glFuncs(QOpenGLContext::currentContext());
-
-    glFuncs.glActiveTexture(GL_TEXTURE3);
-    mat->m_aTexture->bind();
-
-    // Reset the default texture unit.
-    glFuncs.glActiveTexture(GL_TEXTURE0);
-}
-
-
-YUVVideoMaterial::YUVVideoMaterial(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture,
-                                   const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
-                                   const gfx::ColorSpace &colorspace,
-                                   float rMul, float rOff)
-    : m_yTexture(yTexture)
-    , m_uTexture(uTexture)
-    , m_vTexture(vTexture)
-    , m_yaTexCoordRect(yaTexCoordRect)
-    , m_uvTexCoordRect(uvTexCoordRect)
-    , m_yaTexSize(yaTexSize)
-    , m_uvTexSize(uvTexSize)
-    , m_colorSpace(colorspace)
-    , m_resourceMultiplier(rMul)
-    , m_resourceOffset(rOff)
-{
-}
-
-QSGMaterialShader *YUVVideoMaterial::createShader() const
-{
-    return new YUVVideoMaterialShader(m_colorSpace);
-}
-
-int YUVVideoMaterial::compare(const QSGMaterial *other) const
-{
-    const YUVVideoMaterial *m = static_cast<const YUVVideoMaterial *>(other);
-    if (int diff = m_yTexture->textureId() - m->m_yTexture->textureId())
-        return diff;
-    if (int diff = m_uTexture->textureId() - m->m_uTexture->textureId())
-        return diff;
-    return m_vTexture->textureId() - m->m_vTexture->textureId();
-}
-
-YUVAVideoMaterial::YUVAVideoMaterial(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, QSGTexture *aTexture,
-                                     const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
-                                     const gfx::ColorSpace &colorspace,
-                                     float rMul, float rOff)
-    : YUVVideoMaterial(yTexture, uTexture, vTexture, yaTexCoordRect, uvTexCoordRect, yaTexSize, uvTexSize, colorspace, rMul, rOff)
-    , m_aTexture(aTexture)
-{
-    setFlag(Blending, aTexture);
-}
-
-QSGMaterialShader *YUVAVideoMaterial::createShader() const
-{
-    return new YUVAVideoMaterialShader(m_colorSpace);
-}
-
-int YUVAVideoMaterial::compare(const QSGMaterial *other) const
-{
-    if (int diff = YUVVideoMaterial::compare(other))
-        return diff;
-    const YUVAVideoMaterial *m = static_cast<const YUVAVideoMaterial *>(other);
-    return (m_aTexture ? m_aTexture->textureId() : 0) - (m->m_aTexture ? m->m_aTexture->textureId() : 0);
-}
-
-YUVVideoNode::YUVVideoNode(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, QSGTexture *aTexture,
-                           const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
-                           const gfx::ColorSpace &colorspace, float rMul, float rOff)
-    : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
-{
-    setGeometry(&m_geometry);
-    setFlag(QSGNode::OwnsMaterial);
-    if (aTexture)
-        m_material = new YUVAVideoMaterial(yTexture, uTexture, vTexture, aTexture, yaTexCoordRect, uvTexCoordRect, yaTexSize, uvTexSize, colorspace, rMul, rOff);
-    else
-        m_material = new YUVVideoMaterial(yTexture, uTexture, vTexture, yaTexCoordRect, uvTexCoordRect, yaTexSize, uvTexSize, colorspace, rMul, rOff);
-    setMaterial(m_material);
-}
-
-void YUVVideoNode::setRect(const QRectF &rect)
-{
-    QSGGeometry::updateTexturedRectGeometry(geometry(), rect, QRectF(0, 0, 1, 1));
-}
-
-} // namespace
diff --git a/src/core/compositor/yuv_video_node.h b/src/core/compositor/yuv_video_node.h
deleted file mode 100644
index dca8fa5e2..000000000
--- a/src/core/compositor/yuv_video_node.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef YUV_VIDEO_NODE_H
-#define YUV_VIDEO_NODE_H
-
-#include <QtQuick/qsgmaterial.h>
-#include <QtQuick/qsgnode.h>
-
-#include "ui/gfx/color_space.h"
-
-QT_FORWARD_DECLARE_CLASS(QSGTexture)
-
-namespace QtWebEngineCore {
-
-// These classes duplicate, QtQuick style, the logic of GLRenderer::DrawYUVVideoQuad.
-// Their behavior should stay as close as possible to GLRenderer.
-
-class YUVVideoMaterial : public QSGMaterial
-{
-public:
-    YUVVideoMaterial(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture,
-                     const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
-                     const gfx::ColorSpace &colorspace, float rMul, float rOff);
-
-    QSGMaterialType *type() const override
-    {
-        static QSGMaterialType theType;
-        return &theType;
-    }
-
-    QSGMaterialShader *createShader() const override;
-    int compare(const QSGMaterial *other) const override;
-
-    QSGTexture *m_yTexture;
-    QSGTexture *m_uTexture;
-    QSGTexture *m_vTexture;
-    QRectF m_yaTexCoordRect;
-    QRectF m_uvTexCoordRect;
-    QSizeF m_yaTexSize;
-    QSizeF m_uvTexSize;
-    gfx::ColorSpace m_colorSpace;
-    float m_resourceMultiplier;
-    float m_resourceOffset;
-};
-
-class YUVAVideoMaterial : public YUVVideoMaterial
-{
-public:
-    YUVAVideoMaterial(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, QSGTexture *aTexture,
-                      const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
-                      const gfx::ColorSpace &colorspace, float rMul, float rOff);
-
-    QSGMaterialType *type() const override
-    {
-        static QSGMaterialType theType;
-        return &theType;
-    }
-
-    QSGMaterialShader *createShader() const override;
-    int compare(const QSGMaterial *other) const override;
-
-    QSGTexture *m_aTexture;
-};
-
-class YUVVideoNode : public QSGGeometryNode
-{
-public:
-    YUVVideoNode(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, QSGTexture *aTexture,
-                 const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
-                 const gfx::ColorSpace &colorspace, float rMul, float rOff);
-    void setRect(const QRectF &rect);
-
-private:
-    QSGGeometry m_geometry;
-    YUVVideoMaterial *m_material;
-};
-
-} // namespace
-
-#endif // YUV_VIDEO_NODE_H
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index ad766ad77..f2cedaf4a 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -294,14 +294,10 @@ contains(QT_CONFIG, opengl) {
     SOURCES += \
         compositor/compositor_resource_fence.cpp \
         compositor/display_gl_output_surface.cpp \
-        compositor/display_gl_output_surface_qsg.cpp \
-        compositor/stream_video_node.cpp \
-        compositor/yuv_video_node.cpp
+        compositor/display_gl_output_surface_qsg.cpp
     HEADERS += \
         compositor/compositor_resource_fence.h \
-        compositor/display_gl_output_surface.h \
-        compositor/stream_video_node.h \
-        compositor/yuv_video_node.h
+        compositor/display_gl_output_surface.h
 }
 
 qtConfig(webengine-geolocation) {