diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-08-09 16:35:18 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-11 06:33:49 +0000 |
commit | 0277ef2e334453171d8bdd696017d8866c5c1039 (patch) | |
tree | d49427c5ab29bfd1f34cd6f276b1eb9b870fc093 /src | |
parent | 1ad2d7bcc0af354eeffd2e8b780090bcb5273d03 (diff) |
Rename disableReadingFromCanvas to follow naming style
We prefer to name settings with Enabled at the end.
From API review.
Change-Id: I7aacc6dbb92d852fd21b067475d2fd9e7df56163
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
(cherry picked from commit b10ac195de4dac7157575e2899cc19ec45fe1648)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/api/qwebenginesettings.h | 2 | ||||
-rw-r--r-- | src/core/doc/src/qwebenginesettings_lgpl.qdoc | 7 | ||||
-rw-r--r-- | src/core/web_engine_settings.cpp | 6 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebenginesettings.cpp | 22 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebenginesettings_p.h | 8 |
5 files changed, 24 insertions, 21 deletions
diff --git a/src/core/api/qwebenginesettings.h b/src/core/api/qwebenginesettings.h index 8cb10f6a7..7919719a1 100644 --- a/src/core/api/qwebenginesettings.h +++ b/src/core/api/qwebenginesettings.h @@ -60,7 +60,7 @@ public: DnsPrefetchEnabled, PdfViewerEnabled, NavigateOnDropEnabled, - DisableReadingFromCanvas, + ReadingFromCanvasEnabled, }; enum FontSize { diff --git a/src/core/doc/src/qwebenginesettings_lgpl.qdoc b/src/core/doc/src/qwebenginesettings_lgpl.qdoc index 3fdce3ea9..63e9c9710 100644 --- a/src/core/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/core/doc/src/qwebenginesettings_lgpl.qdoc @@ -168,9 +168,10 @@ \value NavigateOnDropEnabled Specifies that navigations can be triggered by dropping URLs on the view. Enabled by default. (Added in Qt 6.4) - \value DisableReadingFromCanvas Specifies that reading from all canvas elements will be disabled. - This setting will have impact on all HTML5 canvas elements irrespective of origin. - Disabled by default. (Added in Qt 6.6) + \value ReadingFromCanvasEnabled Specifies that reading from all canvas elements is enabled. + This setting will have impact on all HTML5 canvas elements irrespective of origin, and can be disabled + to prevent canvas fingerprinting. + Enabled by default. (Added in Qt 6.6) */ /*! diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 40ddbdac7..1e1a3105d 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -261,9 +261,9 @@ void WebEngineSettings::initDefaults() s_defaultAttributes.insert(QWebEngineSettings::PdfViewerEnabled, false); #endif s_defaultAttributes.insert(QWebEngineSettings::NavigateOnDropEnabled, true); - bool readingFromCanvas = + bool noReadingFromCanvas = commandLine->HasSwitch(switches::kDisableReadingFromCanvas); - s_defaultAttributes.insert(QWebEngineSettings::DisableReadingFromCanvas, readingFromCanvas); + s_defaultAttributes.insert(QWebEngineSettings::ReadingFromCanvasEnabled, !noReadingFromCanvas); } if (s_defaultFontFamilies.isEmpty()) { @@ -372,7 +372,7 @@ void WebEngineSettings::applySettingsToWebPreferences(blink::web_pref::WebPrefer prefs->dom_paste_enabled = testAttribute(QWebEngineSettings::JavascriptCanPaste); prefs->dns_prefetching_enabled = testAttribute(QWebEngineSettings::DnsPrefetchEnabled); prefs->navigate_on_drag_drop = testAttribute(QWebEngineSettings::NavigateOnDropEnabled); - prefs->disable_reading_from_canvas = testAttribute(QWebEngineSettings::DisableReadingFromCanvas); + prefs->disable_reading_from_canvas = !testAttribute(QWebEngineSettings::ReadingFromCanvasEnabled); // Fonts settings. prefs->standard_font_family_map[blink::web_pref::kCommonScript] = diff --git a/src/webenginequick/api/qquickwebenginesettings.cpp b/src/webenginequick/api/qquickwebenginesettings.cpp index 54407cc2f..2686a5774 100644 --- a/src/webenginequick/api/qquickwebenginesettings.cpp +++ b/src/webenginequick/api/qquickwebenginesettings.cpp @@ -433,17 +433,19 @@ bool QQuickWebEngineSettings::navigateOnDropEnabled() const } /*! - \qmlproperty bool WebEngineSettings::disableReadingFromCanvas + \qmlproperty bool WebEngineSettings::readingFromCanvasEnabled \since QtWebEngine 6.6 - Disables JavaScript reading from canvas elements. - This setting will have impact on all HTML5 canvas elements irrespective of origin. + Specifies that reading from all canvas elements is enabled. - Disabled by default. + This setting will have impact on all HTML5 canvas elements irrespective of origin, and can be disabled + to prevent canvas fingerprinting. + + Enabled by default. */ -bool QQuickWebEngineSettings::disableReadingFromCanvas() const +bool QQuickWebEngineSettings::readingFromCanvasEnabled() const { - return d_ptr->testAttribute(QWebEngineSettings::DisableReadingFromCanvas); + return d_ptr->testAttribute(QWebEngineSettings::ReadingFromCanvasEnabled); } /*! @@ -729,12 +731,12 @@ void QQuickWebEngineSettings::setNavigateOnDropEnabled(bool on) Q_EMIT navigateOnDropEnabledChanged(); } -void QQuickWebEngineSettings::setDisableReadingFromCanvas(bool on) +void QQuickWebEngineSettings::setReadingFromCanvasEnabled(bool on) { - bool wasOn = d_ptr->testAttribute(QWebEngineSettings::DisableReadingFromCanvas); - d_ptr->setAttribute(QWebEngineSettings::DisableReadingFromCanvas, on); + bool wasOn = d_ptr->testAttribute(QWebEngineSettings::ReadingFromCanvasEnabled); + d_ptr->setAttribute(QWebEngineSettings::ReadingFromCanvasEnabled, on); if (wasOn != on) - Q_EMIT disableReadingFromCanvasChanged(); + Q_EMIT readingFromCanvasEnabledChanged(); } void QQuickWebEngineSettings::setUnknownUrlSchemePolicy(QQuickWebEngineSettings::UnknownUrlSchemePolicy policy) diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h index 2fed034c1..53156da02 100644 --- a/src/webenginequick/api/qquickwebenginesettings_p.h +++ b/src/webenginequick/api/qquickwebenginesettings_p.h @@ -57,7 +57,7 @@ class Q_WEBENGINEQUICK_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject { Q_PROPERTY(bool dnsPrefetchEnabled READ dnsPrefetchEnabled WRITE setDnsPrefetchEnabled NOTIFY dnsPrefetchEnabledChanged REVISION(1,7) FINAL) Q_PROPERTY(bool pdfViewerEnabled READ pdfViewerEnabled WRITE setPdfViewerEnabled NOTIFY pdfViewerEnabledChanged REVISION(1,8) FINAL) Q_PROPERTY(bool navigateOnDropEnabled READ navigateOnDropEnabled WRITE setNavigateOnDropEnabled NOTIFY navigateOnDropEnabledChanged REVISION(6,4) FINAL) - Q_PROPERTY(bool disableReadingFromCanvas READ disableReadingFromCanvas WRITE setDisableReadingFromCanvas NOTIFY disableReadingFromCanvasChanged REVISION(6,6) FINAL) + Q_PROPERTY(bool readingFromCanvasEnabled READ readingFromCanvasEnabled WRITE setReadingFromCanvasEnabled NOTIFY readingFromCanvasEnabledChanged REVISION(6,6) FINAL) QML_NAMED_ELEMENT(WebEngineSettings) QML_ADDED_IN_VERSION(1, 1) QML_EXTRA_VERSION(2, 0) @@ -105,7 +105,7 @@ public: bool dnsPrefetchEnabled() const; bool pdfViewerEnabled() const; bool navigateOnDropEnabled() const; - bool disableReadingFromCanvas() const; + bool readingFromCanvasEnabled() const; void setAutoLoadImages(bool on); void setJavascriptEnabled(bool on); @@ -139,7 +139,7 @@ public: void setDnsPrefetchEnabled(bool on); void setPdfViewerEnabled(bool on); void setNavigateOnDropEnabled(bool on); - void setDisableReadingFromCanvas(bool on); + void setReadingFromCanvasEnabled(bool on); signals: void autoLoadImagesChanged(); @@ -174,7 +174,7 @@ signals: Q_REVISION(1,7) void dnsPrefetchEnabledChanged(); Q_REVISION(1,8) void pdfViewerEnabledChanged(); Q_REVISION(6,4) void navigateOnDropEnabledChanged(); - Q_REVISION(6,6) void disableReadingFromCanvasChanged(); + Q_REVISION(6,6) void readingFromCanvasEnabledChanged(); private: explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = nullptr); |