2010-10-14 Justin Schuh <jschuh@chromium.org>
authorjschuh@chromium.org <jschuh@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 20:48:18 +0000 (20:48 +0000)
committerjschuh@chromium.org <jschuh@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 20:48:18 +0000 (20:48 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@69801 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/rendering/RootInlineBox.cpp

index 3077014..aa621bf 100644 (file)
@@ -1,3 +1,15 @@
+2010-10-14  Justin Schuh  <jschuh@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@chromium.org>
 
         Reviewed by Pavel Feldman.
index 9719e70..c7fcaeb 100644 (file)
@@ -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,