Changeset 100614 in webkit

Timestamp:

Nov 17, 2011 6:23:49 AM (12 years ago)

Author:

Simon Hausmann

Message:

[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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/qt/DnsPrefetchHelper.cpp (modified) (1 diff)
• WebCore/platform/network/qt/DnsPrefetchHelper.h (modified) (1 diff)
• WebKit/qt/Api/qwebsettings.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/network/qt/DnsPrefetchHelper.cpp

@@ -27 +27 @@
 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));
 }
 

trunk/Source/WebCore/platform/network/qt/DnsPrefetchHelper.h

@@ -26 +26 @@
 #include <QString>
 #include <QTime>
-#include "qwebsettings.h"
 
 namespace WebCore {

trunk/Source/WebKit/qt/Api/qwebsettings.cpp

@@ -141 +141 @@
                                       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,

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+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>