diff options
Diffstat (limited to 'src/core/compositor/display_skia_output_device.h')
| -rw-r--r-- | src/core/compositor/display_skia_output_device.h | 56 |
1 files changed, 8 insertions, 48 deletions
diff --git a/src/core/compositor/display_skia_output_device.h b/src/core/compositor/display_skia_output_device.h index b5503ee5e..943d37214 100644 --- a/src/core/compositor/display_skia_output_device.h +++ b/src/core/compositor/display_skia_output_device.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef DISPLAY_SKIA_OUTPUT_DEVICE_H #define DISPLAY_SKIA_OUTPUT_DEVICE_H @@ -61,17 +25,15 @@ public: // Overridden from SkiaOutputDevice. void SetFrameSinkId(const viz::FrameSinkId &frame_sink_id) override; - bool Reshape(const gfx::Size& size, - float devicePixelRatio, + bool Reshape(const SkSurfaceCharacterization &characterization, const gfx::ColorSpace& colorSpace, - gfx::BufferFormat format, + float device_scale_factor, gfx::OverlayTransform transform) override; void SwapBuffers(BufferPresentedCallback feedback, viz::OutputSurfaceFrame frame) override; void EnsureBackbuffer() override; void DiscardBackbuffer() override; - SkSurface *BeginPaint(bool allocate_frame_buffer, - std::vector<GrBackendSemaphore> *semaphores) override; + SkSurface *BeginPaint(std::vector<GrBackendSemaphore> *semaphores) override; void EndPaint() override; // Overridden from Compositor. @@ -85,17 +47,15 @@ public: private: struct Shape { - gfx::Size sizeInPixels; + SkSurfaceCharacterization characterization; float devicePixelRatio; gfx::ColorSpace colorSpace; - gfx::BufferFormat format; bool operator==(const Shape &that) const { - return (sizeInPixels == that.sizeInPixels && + return (characterization == that.characterization && devicePixelRatio == that.devicePixelRatio && - colorSpace == that.colorSpace && - format == that.format); + colorSpace == that.colorSpace); } bool operator!=(const Shape &that) const { return !(*this == that); } }; |