[Qt] Add developerExtrasEnabled to QWebPreferences.

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

Reviewed by Kenneth Rohde Christiansen.

This is required to allow inspecting pages.

* UIProcess/API/qt/qwebpreferences.cpp:
(QWebPreferencesPrivate::testAttribute):
(QWebPreferencesPrivate::setAttribute):
(QWebPreferences::developerExtrasEnabled):
(QWebPreferences::setDeveloperExtrasEnabled):
* UIProcess/API/qt/qwebpreferences_p.h:
* UIProcess/API/qt/qwebpreferences_p_p.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f87f44e..71a5344 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2012-04-03  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] Add developerExtrasEnabled to QWebPreferences.
+        https://bugs.webkit.org/show_bug.cgi?id=83018
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        This is required to allow inspecting pages.
+
+        * UIProcess/API/qt/qwebpreferences.cpp:
+        (QWebPreferencesPrivate::testAttribute):
+        (QWebPreferencesPrivate::setAttribute):
+        (QWebPreferences::developerExtrasEnabled):
+        (QWebPreferences::setDeveloperExtrasEnabled):
+        * UIProcess/API/qt/qwebpreferences_p.h:
+        * UIProcess/API/qt/qwebpreferences_p_p.h:
+
 2012-04-03  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 
         [Qt] Tap highlight attempted hidden several times

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp
index 4aa33f2..16ec7f8 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp
@@ -57,6 +57,8 @@ bool QWebPreferencesPrivate::testAttribute(QWebPreferencesPrivate::WebAttribute
         return WKPreferencesGetDNSPrefetchingEnabled(preferencesRef());
     case FrameFlatteningEnabled:
         return WKPreferencesGetFrameFlatteningEnabled(preferencesRef());
+    case DeveloperExtrasEnabled:
+        return WKPreferencesGetDeveloperExtrasEnabled(preferencesRef());
     default:
         ASSERT_NOT_REACHED();
         return false;
@@ -92,6 +94,8 @@ void QWebPreferencesPrivate::setAttribute(QWebPreferencesPrivate::WebAttribute a
         break;
     case FrameFlatteningEnabled:
         WKPreferencesSetFrameFlatteningEnabled(preferencesRef(), enable);
+    case DeveloperExtrasEnabled:
+        WKPreferencesSetDeveloperExtrasEnabled(preferencesRef(), enable);
         break;
     default:
         ASSERT_NOT_REACHED();
@@ -310,6 +314,17 @@ void QWebPreferences::setDnsPrefetchEnabled(bool enable)
     emit dnsPrefetchEnabledChanged();
 }
 
+bool QWebPreferences::developerExtrasEnabled() const
+{
+    return d->testAttribute(QWebPreferencesPrivate::DeveloperExtrasEnabled);
+}
+
+void QWebPreferences::setDeveloperExtrasEnabled(bool enable)
+{
+    d->setAttribute(QWebPreferencesPrivate::DeveloperExtrasEnabled, enable);
+    emit developerExtrasEnabledChanged();
+}
+
 bool QWebPreferences::navigatorQtObjectEnabled() const
 {
     return d->webViewPrivate->navigatorQtObjectEnabled();

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h
index 82b738f..da8ed39 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h
@@ -41,6 +41,7 @@ public:
     Q_PROPERTY(bool dnsPrefetchEnabled READ dnsPrefetchEnabled WRITE setDnsPrefetchEnabled NOTIFY dnsPrefetchEnabledChanged FINAL)
     Q_PROPERTY(bool navigatorQtObjectEnabled READ navigatorQtObjectEnabled WRITE setNavigatorQtObjectEnabled NOTIFY navigatorQtObjectEnabledChanged FINAL)
     Q_PROPERTY(bool frameFlatteningEnabled READ frameFlatteningEnabled WRITE setFrameFlatteningEnabled NOTIFY frameFlatteningEnabledChanged FINAL)
+    Q_PROPERTY(bool developerExtrasEnabled READ developerExtrasEnabled WRITE setDeveloperExtrasEnabled NOTIFY developerExtrasEnabledChanged FINAL)
 
     Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily NOTIFY standardFontFamilyChanged FINAL)
     Q_PROPERTY(QString fixedFontFamily READ fixedFontFamily WRITE setFixedFontFamily NOTIFY fixedFontFamilyChanged FINAL)
@@ -83,6 +84,9 @@ public:
     bool frameFlatteningEnabled() const;
     void setFrameFlatteningEnabled(bool enable);
 
+    bool developerExtrasEnabled() const;
+    void setDeveloperExtrasEnabled(bool enable);
+
     QString standardFontFamily() const;
     void setStandardFontFamily(const QString& family);
 
@@ -121,6 +125,7 @@ Q_SIGNALS:
     void dnsPrefetchEnabledChanged();
     void navigatorQtObjectEnabledChanged();
     void frameFlatteningEnabledChanged();
+    void developerExtrasEnabledChanged();
 
     void standardFontFamilyChanged();
     void fixedFontFamilyChanged();

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h
index a25985f..48ac16a 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h
@@ -36,7 +36,8 @@ public:
         XSSAuditingEnabled,
         FrameFlatteningEnabled,
         PrivateBrowsingEnabled,
-        DnsPrefetchEnabled
+        DnsPrefetchEnabled,
+        DeveloperExtrasEnabled
     };
 
     enum FontFamily {