Commit e933cf0a authored by hausmann@webkit.org's avatar hausmann@webkit.org

[Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings()

https://bugs.webkit.org/show_bug.cgi?id=72596

Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

We don't need to use QWebSettings here, because we now propagate the DNS prefetch
setting to WebCore::Settings and the rest of WebCore checks the setting before calling
WebCore::prefetchDNS.

* platform/network/qt/DnsPrefetchHelper.cpp:
(WebCore::prefetchDNS): Removed the use of QWebSettings.
* platform/network/qt/DnsPrefetchHelper.h: Remove offending qwebsettings.h inclusion.

Source/WebKit/qt:

* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply): Propagate the DNS prefetch setting to WebCore::Settings.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100614 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 71c57c7d
2011-11-17 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings()
https://bugs.webkit.org/show_bug.cgi?id=72596
Reviewed by Kenneth Rohde Christiansen.
We don't need to use QWebSettings here, because we now propagate the DNS prefetch
setting to WebCore::Settings and the rest of WebCore checks the setting before calling
WebCore::prefetchDNS.
* platform/network/qt/DnsPrefetchHelper.cpp:
(WebCore::prefetchDNS): Removed the use of QWebSettings.
* platform/network/qt/DnsPrefetchHelper.h: Remove offending qwebsettings.h inclusion.
2011-11-17 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] Layer violation: Image::loadPlatformResource uses QWebSettings::webGraphic
......@@ -26,10 +26,8 @@ namespace WebCore {
// this is called on mouse over a href and on page loading
void prefetchDNS(const String& hostname)
{
if (QWebSettings::globalSettings()->testAttribute(QWebSettings::DnsPrefetchEnabled)) {
static DnsPrefetchHelper dnsPrefetchHelper;
dnsPrefetchHelper.lookup(QString(hostname));
}
static DnsPrefetchHelper dnsPrefetchHelper;
dnsPrefetchHelper.lookup(QString(hostname));
}
}
......@@ -25,7 +25,6 @@
#include <QSet>
#include <QString>
#include <QTime>
#include "qwebsettings.h"
namespace WebCore {
......
......@@ -141,6 +141,10 @@ void QWebSettingsPrivate::apply()
global->attributes.value(QWebSettings::AutoLoadImages));
settings->setLoadsImagesAutomatically(value);
value = attributes.value(QWebSettings::DnsPrefetchEnabled,
global->attributes.value(QWebSettings::DnsPrefetchEnabled));
settings->setDNSPrefetchingEnabled(value);
value = attributes.value(QWebSettings::JavascriptEnabled,
global->attributes.value(QWebSettings::JavascriptEnabled));
settings->setScriptEnabled(value);
......
2011-11-17 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings()
https://bugs.webkit.org/show_bug.cgi?id=72596
Reviewed by Kenneth Rohde Christiansen.
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply): Propagate the DNS prefetch setting to WebCore::Settings.
2011-11-17 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] Layer violation: Image::loadPlatformResource uses QWebSettings::webGraphic
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment