Add settings to WebEngineProfiles

This patch adds settings to profiles so common settings might be shared
among all pages in a profile. The former global settings are now replaced
by the settings of the default profile.

Change-Id: I544420e07beeb52ef29b2360bc7929402650cd07
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

2 files changed, 60 insertions, 44 deletions

diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index b46775934..0aaa09814 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -67,7 +67,6 @@ private:
     WebEngineSettings *m_settings;
 };
 
-#include "web_engine_settings.moc"
 
 static inline bool isTouchScreenAvailable() {
     static bool initialized = false;
@@ -85,16 +84,23 @@ static inline bool isTouchScreenAvailable() {
 }
 
 
-WebEngineSettings::WebEngineSettings(WebEngineSettingsDelegate *delegate)
+WebEngineSettings::WebEngineSettings(WebEngineSettings *_parentSettings)
     : m_adapter(0)
-    , m_delegate(delegate)
     , m_batchTimer(new BatchTimer(this))
+    , parentSettings(_parentSettings)
 {
-    Q_ASSERT(delegate);
+    if (parentSettings)
+        parentSettings->childSettings.insert(this);
 }
 
 WebEngineSettings::~WebEngineSettings()
 {
+    if (parentSettings)
+        parentSettings->childSettings.remove(this);
+    // In QML the profile and its settings may be garbage collected before the page and its settings.
+    Q_FOREACH (WebEngineSettings *settings, childSettings) {
+        settings->parentSettings = 0;
+    }
 }
 
 void WebEngineSettings::overrideWebPreferences(content::WebPreferences *prefs)
@@ -111,94 +117,86 @@ void WebEngineSettings::overrideWebPreferences(content::WebPreferences *prefs)
 void WebEngineSettings::setAttribute(WebEngineSettings::Attribute attr, bool on)
 {
     m_attributes.insert(attr, on);
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 bool WebEngineSettings::testAttribute(WebEngineSettings::Attribute attr) const
 {
-    WebEngineSettings *fallback = m_delegate->fallbackSettings();
-    Q_ASSERT(fallback);
-    if (this == fallback) {
+    if (!parentSettings) {
         Q_ASSERT(m_attributes.contains(attr));
         return m_attributes.value(attr);
     }
-    return m_attributes.value(attr, fallback->testAttribute(attr));
+    return m_attributes.value(attr, parentSettings->testAttribute(attr));
 }
 
 void WebEngineSettings::resetAttribute(WebEngineSettings::Attribute attr)
 {
-    if (this == m_delegate->fallbackSettings())
+    if (!parentSettings) // FIXME: Set initial defaults.
         return;
     m_attributes.remove(attr);
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 void WebEngineSettings::setFontFamily(WebEngineSettings::FontFamily which, const QString &family)
 {
     m_fontFamilies.insert(which, family);
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 QString WebEngineSettings::fontFamily(WebEngineSettings::FontFamily which)
 {
-    WebEngineSettings *fallback = m_delegate->fallbackSettings();
-    Q_ASSERT(fallback);
-    if (this == fallback) {
+    if (!parentSettings) {
         Q_ASSERT(m_fontFamilies.contains(which));
         return m_fontFamilies.value(which);
     }
-    return m_fontFamilies.value(which, fallback->fontFamily(which));
+    return m_fontFamilies.value(which, parentSettings->fontFamily(which));
 }
 
 void WebEngineSettings::resetFontFamily(WebEngineSettings::FontFamily which)
 {
-    if (this == m_delegate->fallbackSettings())
+    if (!parentSettings) // FIXME: Set initial defaults.
         return;
     m_fontFamilies.remove(which);
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 void WebEngineSettings::setFontSize(WebEngineSettings::FontSize type, int size)
 {
     m_fontSizes.insert(type, size);
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 int WebEngineSettings::fontSize(WebEngineSettings::FontSize type) const
 {
-    WebEngineSettings *fallback = m_delegate->fallbackSettings();
-    Q_ASSERT(fallback);
-    if (this == fallback) {
+    if (!parentSettings) {
         Q_ASSERT(m_fontSizes.contains(type));
         return m_fontSizes.value(type);
     }
-    return m_fontSizes.value(type, fallback->fontSize(type));
+    return m_fontSizes.value(type, parentSettings->fontSize(type));
 }
 
 void WebEngineSettings::resetFontSize(WebEngineSettings::FontSize type)
 {
-    if (this == m_delegate->fallbackSettings())
+    if (!parentSettings) // FIXME: Set initial defaults.
         return;
     m_fontSizes.remove(type);
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 void WebEngineSettings::setDefaultTextEncoding(const QString &encoding)
 {
     m_defaultEncoding = encoding;
-    m_delegate->apply();
+    scheduleApplyRecursively();
 }
 
 QString WebEngineSettings::defaultTextEncoding() const
 {
-    WebEngineSettings *fallback = m_delegate->fallbackSettings();
-    Q_ASSERT(fallback);
-    if (this == fallback)
+    if (!parentSettings)
         return m_defaultEncoding;
-    return m_defaultEncoding.isEmpty()? fallback->defaultTextEncoding() : m_defaultEncoding;
+    return m_defaultEncoding.isEmpty()? parentSettings->defaultTextEncoding() : m_defaultEncoding;
 }
 
-void WebEngineSettings::initDefaults()
+void WebEngineSettings::initDefaults(bool offTheRecord)
 {
     // Initialize the default settings.
     m_attributes.insert(AutoLoadImages, true);
@@ -206,7 +204,7 @@ void WebEngineSettings::initDefaults()
     m_attributes.insert(JavascriptCanOpenWindows, true);
     m_attributes.insert(JavascriptCanAccessClipboard, false);
     m_attributes.insert(LinksIncludedInFocusChain, true);
-    m_attributes.insert(LocalStorageEnabled, true);
+    m_attributes.insert(LocalStorageEnabled, !offTheRecord);
     m_attributes.insert(LocalContentCanAccessRemoteUrls, false);
     m_attributes.insert(XSSAuditingEnabled, false);
     m_attributes.insert(SpatialNavigationEnabled, false);
@@ -294,3 +292,22 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
     prefs->minimum_logical_font_size = fontSize(MinimumLogicalFontSize);
     prefs->default_encoding = defaultTextEncoding().toStdString();
 }
+
+void WebEngineSettings::scheduleApplyRecursively()
+{
+    scheduleApply();
+    Q_FOREACH (WebEngineSettings *settings, childSettings) {
+        settings->scheduleApply();
+    }
+}
+
+void WebEngineSettings::setParentSettings(WebEngineSettings *_parentSettings)
+{
+    if (parentSettings)
+        parentSettings->childSettings.remove(this);
+    parentSettings = _parentSettings;
+    if (parentSettings)
+        parentSettings->childSettings.insert(this);
+}
+
+#include "web_engine_settings.moc"
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 42dff4b3c..8ee7d8871 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -43,6 +43,7 @@
 #include <QScopedPointer>
 #include <QHash>
 #include <QUrl>
+#include <QSet>
 
 class BatchTimer;
 class WebContentsAdapter;
@@ -52,14 +53,6 @@ namespace content {
 struct WebPreferences;
 }
 
-class QWEBENGINE_EXPORT WebEngineSettingsDelegate {
-public:
-    virtual ~WebEngineSettingsDelegate() {}
-    virtual void apply() = 0;
-    // Needs to be a valid pointer, the last available fallback (ex: global settings) should return itself.
-    virtual WebEngineSettings *fallbackSettings() const = 0;
-};
-
 class QWEBENGINE_EXPORT WebEngineSettings {
 public:
     // Attributes. Names match the ones from the public widgets API.
@@ -98,8 +91,10 @@ public:
         DefaultFixedFontSize
     };
 
-    WebEngineSettings(WebEngineSettingsDelegate*);
-    virtual ~WebEngineSettings();
+    explicit WebEngineSettings(WebEngineSettings *parentSettings = 0);
+    ~WebEngineSettings();
+
+    void setParentSettings(WebEngineSettings *parentSettings);
 
     void overrideWebPreferences(content::WebPreferences *prefs);
 
@@ -118,16 +113,17 @@ public:
     void setDefaultTextEncoding(const QString &encoding);
     QString defaultTextEncoding() const;
 
-    void initDefaults();
+    void initDefaults(bool offTheRecord = false);
     void scheduleApply();
 
+    void scheduleApplyRecursively();
+
 private:
     void doApply();
     void applySettingsToWebPreferences(content::WebPreferences *);
     void setWebContentsAdapter(WebContentsAdapter *adapter) { m_adapter = adapter; }
 
     WebContentsAdapter* m_adapter;
-    WebEngineSettingsDelegate* m_delegate;
     QHash<Attribute, bool> m_attributes;
     QHash<FontFamily, QString> m_fontFamilies;
     QHash<FontSize, int> m_fontSizes;
@@ -135,6 +131,9 @@ private:
     QScopedPointer<content::WebPreferences> webPreferences;
     QScopedPointer<BatchTimer> m_batchTimer;
 
+    WebEngineSettings *parentSettings;
+    QSet<WebEngineSettings *> childSettings;
+
     friend class BatchTimer;
     friend class WebContentsAdapter;
 };