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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3fc16fa1b6a1e9a67584c357733c9022a8a82b5b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 22:10:38 2009 +0000

    2009-10-19  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Replace boolean operator indentation example with an if statement.
    
            https://bugs.webkit.org/show_bug.cgi?id=30538
    
            * coding/coding-style.html: Replace boolean indenting example to use "if"
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49816 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index b1f6880..57064f6 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-19  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Replace boolean operator indentation example with an if statement.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30538
+
+        * coding/coding-style.html: Replace boolean indenting example to use "if"
+
 2009-10-16  Darin Adler  <darin at apple.com>
 
         * coding/RefPtr.html: Minor revision, updating a link and tweaking
diff --git a/WebKitSite/coding/coding-style.html b/WebKitSite/coding/coding-style.html
index 2698ea8..09e2f3c 100644
--- a/WebKitSite/coding/coding-style.html
+++ b/WebKitSite/coding/coding-style.html
@@ -120,16 +120,18 @@ have their operators on the left side of the line instead of the right side.
 
 <h4 class="right">Right:</h4>
 <pre class="code">
-return attr->name() == srcAttr
+if (attr->name() == srcAttr
     || attr->name() == lowsrcAttr
-    || (attr->name() == usemapAttr && attr->value().domString()[0] != '#');
+    || (attr->name() == usemapAttr && attr->value().domString()[0] != '#'))
+    return;
 </pre>
 
 <h4 class="wrong">Wrong:</h4>
 <pre class="code">
-return attr->name() == srcAttr ||
+if (attr->name() == srcAttr ||
     attr->name() == lowsrcAttr ||
-    (attr->name() == usemapAttr && attr->value().domString()[0] != '#');
+    (attr->name() == usemapAttr && attr->value().domString()[0] != '#'))
+    return;
 </pre>
 </li>
 

-- 
WebKit Debian packaging