[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[weinig at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 9db2e8fd277815dcb76c48286771f1b6dd5bd4b0
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 05:30:13 2009 +0000

    Fix for https://bugs.webkit.org/show_bug.cgi?id=30196
    Change style guidelines for indentation in header files
    
    Reviewed by Dan Bernstein.
    
    * coding/coding-style.html: Don't indent in a namespace in a header file.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index d09b843..fcb01b6 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-07  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=30196
+        Change style guidelines for indentation in header files
+
+        * coding/coding-style.html: Don't indent in a namespace in a header file.
+
 2009-10-07  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/WebKitSite/coding/coding-style.html b/WebKitSite/coding/coding-style.html
index 0ad12a5..2698ea8 100644
--- a/WebKitSite/coding/coding-style.html
+++ b/WebKitSite/coding/coding-style.html
@@ -41,37 +41,19 @@ int main()
 }
 </pre>
 </li>
-<li>In a header, code inside a namespace should be indented.
+<li>Code inside a namespace should not be indented.
 <h4 class="right">Right:</h4>
 <pre class="code">
 // Document.h
 namespace WebCore {
 
-    class Document {
-        Document();
-        ...
-    };
-
-} // namespace WebCore
-</pre>
-
-<h4 class="wrong">Wrong:</h4>
-<pre class="code">
-// Document.h
-namespace WebCore {
-
 class Document {
     Document();
     ...
 };
 
 } // namespace WebCore
-</pre>
-</li>
 
-<li>In an implementation file (files with the extension .cpp, .c or .mm), code inside a namespace should <em>not</em> be indented.
-<h4 class="right">Right:</h4>
-<pre class="code">
 // Document.cpp
 namespace WebCore {
 
@@ -85,6 +67,16 @@ Document::Document()
 
 <h4 class="wrong">Wrong:</h4>
 <pre class="code">
+// Document.h
+namespace WebCore {
+
+    class Document {
+        Document();
+        ...
+    };
+
+} // namespace WebCore
+
 // Document.cpp
 namespace WebCore {
 
@@ -96,6 +88,7 @@ namespace WebCore {
 } // namespace WebCore
 </pre>
 </li>
+
 <li>A case label should line up with its switch statement.  The case statement is indented.
 <h4 class="right">Right:</h4>
 <pre class="code">

-- 
WebKit Debian packaging