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

[jschuh at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 47e5eb703fb038aaab585447ca24235ea0413501
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 20:48:18 2010 +0000

    2010-10-14  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by James Robinson.
    
            Style fix for r69735
            https://bugs.webkit.org/show_bug.cgi?id=47684
    
            No logic change. Existing tests apply.
    
            * rendering/RootInlineBox.cpp:
            (WebCore::RootInlineBox::alignBoxesInBlockDirection):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69801 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3077014..aa621bf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-14  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by James Robinson.
+
+        Style fix for r69735
+        https://bugs.webkit.org/show_bug.cgi?id=47684
+
+        No logic change. Existing tests apply.
+
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::alignBoxesInBlockDirection):
+
 2010-10-14  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/rendering/RootInlineBox.cpp b/WebCore/rendering/RootInlineBox.cpp
index 9719e70..c7fcaeb 100644
--- a/WebCore/rendering/RootInlineBox.cpp
+++ b/WebCore/rendering/RootInlineBox.cpp
@@ -246,9 +246,7 @@ int RootInlineBox::alignBoxesInBlockDirection(int heightOfBlock, GlyphOverflowAn
     if (heightOfBlock > numeric_limits<int>::max() - maxHeight)
         return numeric_limits<int>::max();
 
-    heightOfBlock = heightOfBlock + maxHeight;
-    
-    return heightOfBlock;
+    return heightOfBlock + maxHeight;
 }
 
 GapRects RootInlineBox::fillLineSelectionGap(int selTop, int selHeight, RenderBlock* rootBlock, int blockX, int blockY, int tx, int ty,

-- 
WebKit Debian packaging