[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[timothy at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a06c3ecd94af8e52ae1e3b912438f6ff03a1e129
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 18:45:15 2010 +0000

    Add API for enabling the developer extras (Web Inspector).
    
    http://webkit.org/b/48439
    
    Reviewed by John Sullivan.
    
    * Shared/WebPreferencesStore.cpp:
    (WebKit::WebPreferencesStore::WebPreferencesStore):
    (WebKit::WebPreferencesStore::encode):
    (WebKit::WebPreferencesStore::decode):
    * Shared/WebPreferencesStore.h:
    * UIProcess/API/C/WKPreferences.cpp:
    (WKPreferencesSetDeveloperExtrasEnabled):
    (WKPreferencesGetDeveloperExtrasEnabled):
    * UIProcess/API/C/WKPreferences.h:
    * UIProcess/WebPreferences.cpp:
    (WebKit::WebPreferences::setDeveloperExtrasEnabled):
    (WebKit::WebPreferences::developerExtrasEnabled):
    * UIProcess/WebPreferences.h:
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::updatePreferences):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70680 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bc2dda1..79fdb4f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,27 @@
+2010-10-27  Timothy Hatcher  <timothy at apple.com>
+
+        Add API for enabling the developer extras (Web Inspector).
+
+        http://webkit.org/b/48439
+
+        Reviewed by John Sullivan.
+
+        * Shared/WebPreferencesStore.cpp:
+        (WebKit::WebPreferencesStore::WebPreferencesStore):
+        (WebKit::WebPreferencesStore::encode):
+        (WebKit::WebPreferencesStore::decode):
+        * Shared/WebPreferencesStore.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetDeveloperExtrasEnabled):
+        (WKPreferencesGetDeveloperExtrasEnabled):
+        * UIProcess/API/C/WKPreferences.h:
+        * UIProcess/WebPreferences.cpp:
+        (WebKit::WebPreferences::setDeveloperExtrasEnabled):
+        (WebKit::WebPreferences::developerExtrasEnabled):
+        * UIProcess/WebPreferences.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2010-10-27  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index 14f083c..1cb6433 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -45,6 +45,7 @@ WebPreferencesStore::WebPreferencesStore()
     , compositingBordersVisible(false)
     , compositingRepaintCountersVisible(false)
     , privateBrowsingEnabled(false)
+    , developerExtrasEnabled(false)
     , fontSmoothingLevel(FontSmoothingLevelMedium)
     , minimumFontSize(1)
     , minimumLogicalFontSize(9)
@@ -79,6 +80,7 @@ void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder* encoder) const
     encoder->encode(xssAuditorEnabled);
     encoder->encode(frameFlatteningEnabled);
     encoder->encode(privateBrowsingEnabled);
+    encoder->encode(developerExtrasEnabled);
     encoder->encode(fontSmoothingLevel);
     encoder->encode(minimumFontSize);
     encoder->encode(minimumLogicalFontSize);
@@ -115,6 +117,8 @@ bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferenc
         return false;
     if (!decoder->decode(s.privateBrowsingEnabled))
         return false;
+    if (!decoder->decode(s.developerExtrasEnabled))
+        return false;
     if (!decoder->decode(s.fontSmoothingLevel))
         return false;
     if (!decoder->decode(s.minimumFontSize))
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index f3adb35..7d8f60c 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -57,6 +57,8 @@ struct WebPreferencesStore {
 
     bool privateBrowsingEnabled;
 
+    bool developerExtrasEnabled;
+
     uint32_t fontSmoothingLevel;
 
     uint32_t minimumFontSize;
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 97a0668..69e8e47 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -198,3 +198,13 @@ bool WKPreferencesGetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef)
 {
     return toImpl(preferencesRef)->privateBrowsingEnabled();
 }
+
+void WKPreferencesSetDeveloperExtrasEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+    toImpl(preferencesRef)->setDeveloperExtrasEnabled(enabled);
+}
+
+bool WKPreferencesGetDeveloperExtrasEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->developerExtrasEnabled();
+}
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index 197afc9..fb9f633 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -95,6 +95,10 @@ WK_EXPORT WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef prefer
 WK_EXPORT void WKPreferencesSetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef, bool enabled);
 WK_EXPORT bool WKPreferencesGetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef);
 
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetDeveloperExtrasEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetDeveloperExtrasEnabled(WKPreferencesRef preferencesRef);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index 91df90e..517e743 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -141,6 +141,17 @@ bool WebPreferences::privateBrowsingEnabled() const
     return m_store.privateBrowsingEnabled;
 }
 
+void WebPreferences::setDeveloperExtrasEnabled(bool b)
+{
+    m_store.developerExtrasEnabled = b;
+    update();
+}
+
+bool WebPreferences::developerExtrasEnabled() const
+{
+    return m_store.developerExtrasEnabled;
+}
+
 void WebPreferences::setPluginsEnabled(bool b)
 {
     m_store.pluginsEnabled = b;
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index 4ec413a..862a419 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -114,7 +114,10 @@ public:
 
     void setPrivateBrowsingEnabled(bool);
     bool privateBrowsingEnabled() const;
-    
+
+    void setDeveloperExtrasEnabled(bool);
+    bool developerExtrasEnabled() const;
+
 private:
     WebPreferences();
     WebPreferences(WebPreferences*);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 9421a8c..53af956 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -734,6 +734,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings->setXSSAuditorEnabled(store.xssAuditorEnabled);
     settings->setFrameFlatteningEnabled(store.frameFlatteningEnabled);
     settings->setPrivateBrowsingEnabled(store.privateBrowsingEnabled);
+    settings->setDeveloperExtrasEnabled(store.developerExtrasEnabled);
     settings->setMinimumFontSize(store.minimumFontSize);
     settings->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
     settings->setDefaultFontSize(store.defaultFontSize);

-- 
WebKit Debian packaging