1 files changed, 16 insertions, 47 deletions

diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 5be72005a..2bfc5949d 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 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
 
 //
 //  W A R N I N G
@@ -51,8 +15,8 @@
 #ifndef WEB_ENGINE_SETTINGS_H
 #define WEB_ENGINE_SETTINGS_H
 
-#include "qtwebenginecoreglobal_p.h"
-#include "qwebenginesettings.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
+#include <QtWebEngineCore/qwebenginesettings.h>
 #include <QScopedPointer>
 #include <QHash>
 #include <QUrl>
@@ -61,11 +25,12 @@
 
 namespace content {
 class WebContents;
-struct WebPreferences;
 }
+
 namespace blink {
-namespace mojom {
-class RendererPreferences;
+struct RendererPreferences;
+namespace web_pref {
+struct WebPreferences;
 }
 }
 namespace QtWebEngineCore {
@@ -81,7 +46,7 @@ public:
 
     void setParentSettings(WebEngineSettings *parentSettings);
 
-    void overrideWebPreferences(content::WebContents *webContents, content::WebPreferences *prefs);
+    void overrideWebPreferences(content::WebContents *webContents, blink::web_pref::WebPreferences *prefs);
 
     void setAttribute(QWebEngineSettings::WebAttribute, bool on);
     bool testAttribute(QWebEngineSettings::WebAttribute) const;
@@ -102,6 +67,9 @@ public:
     void setUnknownUrlSchemePolicy(QWebEngineSettings::UnknownUrlSchemePolicy policy);
     QWebEngineSettings::UnknownUrlSchemePolicy unknownUrlSchemePolicy() const;
 
+    void setImageAnimationPolicy(QWebEngineSettings::ImageAnimationPolicy policy);
+    QWebEngineSettings::ImageAnimationPolicy imageAnimationPolicy() const;
+
     void scheduleApply();
 
     void scheduleApplyRecursively();
@@ -111,8 +79,8 @@ public:
 private:
     void initDefaults();
     void doApply();
-    void applySettingsToWebPreferences(content::WebPreferences *);
-    bool applySettingsToRendererPreferences(blink::mojom::RendererPreferences *);
+    void applySettingsToWebPreferences(blink::web_pref::WebPreferences *);
+    bool applySettingsToRendererPreferences(blink::RendererPreferences *);
     void setWebContentsAdapter(WebContentsAdapter *adapter) { m_adapter = adapter; }
 
     WebContentsAdapter* m_adapter;
@@ -120,7 +88,7 @@ private:
     QHash<QWebEngineSettings::FontFamily, QString> m_fontFamilies;
     QHash<QWebEngineSettings::FontSize, int> m_fontSizes;
     QString m_defaultEncoding;
-    QScopedPointer<content::WebPreferences> webPreferences;
+    QScopedPointer<blink::web_pref::WebPreferences> webPreferences;
     QTimer m_batchTimer;
 
     WebEngineSettings *parentSettings;
@@ -130,6 +98,7 @@ private:
     static QHash<QWebEngineSettings::FontFamily, QString> s_defaultFontFamilies;
     static QHash<QWebEngineSettings::FontSize, int> s_defaultFontSizes;
     QWebEngineSettings::UnknownUrlSchemePolicy m_unknownUrlSchemePolicy;
+    QWebEngineSettings::ImageAnimationPolicy m_imageAnimationPolicy;
 
     friend class WebContentsAdapter;
 };