[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[snej at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit decfe6ff9384ff3bc0f8d8dc22890f2e69f96b96
Author: snej at chromium.org <snej at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 23:16:35 2010 +0000

    Clarified coding guidelines on wiki to allow indentation of _nested_ namespaces.
    Reviewed by David Levin.
    https://bugs.webkit.org/show_bug.cgi?id=32137
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index 044fb1d..9aea763 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-02  Jens Alfke  <snej at chromium.org>
+
+        Reviewed by David Levin.
+
+        Clarified coding guidelines on wiki to allow indentation of
+        _nested_ namespaces.
+        https://bugs.webkit.org/show_bug.cgi?id=32137
+
+        * coding/coding-style.html:
+
 2010-01-24  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebKitSite/coding/coding-style.html b/WebKitSite/coding/coding-style.html
index abd1b72..7bc3c7f 100644
--- a/WebKitSite/coding/coding-style.html
+++ b/WebKitSite/coding/coding-style.html
@@ -45,7 +45,8 @@ int main()
 }
 </pre>
 </li>
-<li>Code inside a namespace should not be indented.
+<li>The contents of an outermost <code>namespace</code> block (and any nested namespaces with the same scope)
+should not be indented. The contents of other nested namespaces should be indented.
 <h4 class="right">Right:</h4>
 <pre class="code">
 // Document.h
@@ -56,6 +57,10 @@ class Document {
     ...
 };
 
+namespace NestedNamespace {
+    ...
+}
+
 } // namespace WebCore
 
 // Document.cpp
@@ -79,6 +84,10 @@ namespace WebCore {
         ...
     };
 
+    namespace NestedNamespace {
+    ...
+    }
+
 } // namespace WebCore
 
 // Document.cpp

-- 
WebKit Debian packaging