[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e9b5013fd809ce31957fa72e2b4ec359c7ba9941
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 05:47:47 2010 +0000

    2010-02-14  Vangelis Kokkevis  <vangelis at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [Chromium] Add support for the showDebugBorders setting to Chromium.
    
            https://bugs.webkit.org/show_bug.cgi?id=34906
    
            * public/WebSettings.h: Add declaration for setShowDebugBorders
            * src/WebSettingsImpl.cpp:
            (WebKit::WebSettingsImpl::setShowDebugBorders): Add method implementation
            * src/WebSettingsImpl.h: Added declaration for setShowDebugBorders
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3ab0b04..2ab92e1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-14  Vangelis Kokkevis  <vangelis at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add support for the showDebugBorders setting to Chromium.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34906
+
+        * public/WebSettings.h: Add declaration for setShowDebugBorders
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setShowDebugBorders): Add method implementation
+        * src/WebSettingsImpl.h: Added declaration for setShowDebugBorders
+
 2010-02-11  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index d75ccde..03097ac 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -82,6 +82,7 @@ public:
     virtual void setOfflineWebApplicationCacheEnabled(bool) = 0;
     virtual void setExperimentalWebGLEnabled(bool) = 0;
     virtual void setGeolocationEnabled(bool) = 0;
+    virtual void setShowDebugBorders(bool) = 0;
 
 protected:
     ~WebSettings() { }
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index 5cfbd4f..d87951c 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -254,6 +254,11 @@ void WebSettingsImpl::setExperimentalWebGLEnabled(bool enabled)
     m_settings->setWebGLEnabled(enabled);
 }
 
+void WebSettingsImpl::setShowDebugBorders(bool show)
+{
+    m_settings->setShowDebugBorders(show);
+}
+
 void WebSettingsImpl::setGeolocationEnabled(bool enabled)
 {
     m_settings->setGeolocationEnabled(enabled);
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 3b69fe6..cd01a95 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -84,6 +84,7 @@ public:
     virtual void setOfflineWebApplicationCacheEnabled(bool);
     virtual void setExperimentalWebGLEnabled(bool);
     virtual void setGeolocationEnabled(bool);
+    virtual void setShowDebugBorders(bool);
 
 private:
     WebCore::Settings* m_settings;

-- 
WebKit Debian packaging