[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0ef796c845a7c0d0cab8df2b00999feaa0fc2ddc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 11:22:45 2010 +0000

    2010-12-29  Juha Savolainen  <juha.savolainen at weego.fi>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] [WK2] Added more webattributes to the qwkpreferences
            https://bugs.webkit.org/show_bug.cgi?id=51697
    
            Added PrivateBrowsingEnabled, DeveloperExtrasEnabled, DnsPrefetchEnabled attributes
    
            * UIProcess/API/qt/qwkpreferences.cpp:
            (QWKPreferences::testAttribute):
            (QWKPreferences::setAttribute):
            * UIProcess/API/qt/qwkpreferences.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74738 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2dfb09f..84ac94e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-29  Juha Savolainen  <juha.savolainen at weego.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] [WK2] Added more webattributes to the qwkpreferences
+        https://bugs.webkit.org/show_bug.cgi?id=51697
+
+        Added PrivateBrowsingEnabled, DeveloperExtrasEnabled, DnsPrefetchEnabled attributes
+
+        * UIProcess/API/qt/qwkpreferences.cpp:
+        (QWKPreferences::testAttribute): 
+        (QWKPreferences::setAttribute): 
+        * UIProcess/API/qt/qwkpreferences.h:
+
 2010-12-27  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/API/qt/qwkpreferences.cpp b/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
index d558078..dea18aa 100644
--- a/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
@@ -134,6 +134,12 @@ bool QWKPreferences::testAttribute(WebAttribute attr) const
         return WKPreferencesGetXSSAuditorEnabled(d->ref);
     case FrameFlatteningEnabled:
         return WKPreferencesGetFrameFlatteningEnabled(d->ref);
+    case PrivateBrowsingEnabled:
+        return WKPreferencesGetPrivateBrowsingEnabled(d->ref);
+    case DeveloperExtrasEnabled:
+        return WKPreferencesGetDeveloperExtrasEnabled(d->ref);
+    case DnsPrefetchEnabled:
+        return WKPreferencesGetDNSPrefetchingEnabled(d->ref);
     default:
         ASSERT_NOT_REACHED();
         return false;
@@ -164,6 +170,15 @@ void QWKPreferences::setAttribute(WebAttribute attr, bool on)
     case FrameFlatteningEnabled:
         WKPreferencesSetFrameFlatteningEnabled(d->ref, on);
         break;
+    case PrivateBrowsingEnabled:
+        WKPreferencesSetPrivateBrowsingEnabled(d->ref, on);
+        break;
+    case DeveloperExtrasEnabled:
+        WKPreferencesSetDeveloperExtrasEnabled(d->ref, on);
+        break;
+    case DnsPrefetchEnabled:
+        WKPreferencesSetDNSPrefetchingEnabled(d->ref, on);
+        break;
     default:
         ASSERT_NOT_REACHED();
     }
diff --git a/WebKit2/UIProcess/API/qt/qwkpreferences.h b/WebKit2/UIProcess/API/qt/qwkpreferences.h
index 7fae643..d9f7bc0 100644
--- a/WebKit2/UIProcess/API/qt/qwkpreferences.h
+++ b/WebKit2/UIProcess/API/qt/qwkpreferences.h
@@ -43,7 +43,10 @@ public:
         OfflineWebApplicationCacheEnabled,
         LocalStorageEnabled,
         XSSAuditingEnabled,
-        FrameFlatteningEnabled
+        FrameFlatteningEnabled,
+        PrivateBrowsingEnabled,
+        DeveloperExtrasEnabled,
+        DnsPrefetchEnabled
     };
 
     static QWKPreferences* sharedPreferences();

-- 
WebKit Debian packaging