diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 17:45:07 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-15 14:10:26 +0200 |
commit | 2694ec6605891271ed99f69a03b3929178655963 (patch) | |
tree | e34426d92ffced7db70f7a3e4b8ba95ffa67c1e6 /src/webenginewidgets/api/qwebenginesettings.cpp | |
parent | 4fec7134b45c61422acb63043b70b3bb0456d690 (diff) |
Fix a crash in WebEngineSettings when opening a new window
A new window means that the QWebEnginePage gets its WebContentsAdapter
swapped and that the pointer in WebEngineSettings must be updated.
Do the WebContentsAdapter-to-WebEngineSettings binding in
WebContentsAdapter::initialize to cover both cases.
This also refactors the way that QWebEngineSettings is created by
removing the need to pass a QWebEngineSettingsPrivate instance to be
adopted, and also move the global settings construction logic in
the singleton accessor instead of relying on the fact that it uses
a different contructor.
Change-Id: I6f8a2ed1407a4b25f9898526db9432721c354ddf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginesettings.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 52cc59a80..b2a57952f 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -84,15 +84,11 @@ QWebEngineSettingsPrivate::QWebEngineSettingsPrivate() { } -QWebEngineSettingsPrivate::QWebEngineSettingsPrivate(WebContentsAdapter *adapter) - : coreSettings(new WebEngineSettings(this, adapter)) -{ -} - void QWebEngineSettingsPrivate::apply() { coreSettings->scheduleApply(); QWebEngineSettingsPrivate *globals = QWebEngineSettings::globalSettings()->d; + Q_ASSERT((this == globals) != (allSettings->contains(this))); if (this == globals) { Q_FOREACH (QWebEngineSettingsPrivate *settings, *allSettings) settings->coreSettings->scheduleApply(); @@ -111,8 +107,12 @@ WebEngineSettings *QWebEngineSettingsPrivate::fallbackSettings() const { QWebEngineSettings *QWebEngineSettings::globalSettings() { static QWebEngineSettings* globalSettings = 0; - if (!globalSettings) + if (!globalSettings) { globalSettings = new QWebEngineSettings; + // globalSettings shouldn't be in that list. + allSettings->removeAll(globalSettings->d); + globalSettings->d->initDefaults(); + } return globalSettings; } @@ -162,14 +162,6 @@ void QWebEngineSettings::resetFontSize(QWebEngineSettings::FontSize type) QWebEngineSettings::QWebEngineSettings() : d(new QWebEngineSettingsPrivate) { - d->initDefaults(); -} - - -QWebEngineSettings::QWebEngineSettings(QWebEngineSettingsPrivate *p) - : d(p) -{ - Q_ASSERT(d); allSettings->append(d); d->coreSettings->scheduleApply(); } |