Delete a ton more dead vertical writing mode code.

sky/engine/core/rendering/RootInlineBox.cpp

 /*
  * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 38 matching lines @@
 RootInlineBox::RootInlineBox(RenderBlockFlow& block)
     : InlineFlowBox(block)
     , m_lineBreakPos(0)
     , m_lineBreakObj(0)
     , m_lineTop(0)
     , m_lineBottom(0)
     , m_lineTopWithLeading(0)
     , m_lineBottomWithLeading(0)
     , m_selectionBottom(0)
 {
-    setIsHorizontal(block.isHorizontalWritingMode());
+    // FIXME(sky): Remove
+    setIsHorizontal(true);
 }
 
 
 void RootInlineBox::destroy()
 {
     detachEllipsisBox();
     InlineFlowBox::destroy();
 }
 
 void RootInlineBox::detachEllipsisBox()
@@ skipping 181 matching lines @@
 {
     float maxLogicalTop = 0;
     computeMaxLogicalTop(maxLogicalTop);
     return maxLogicalTop;
 }
 
 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const
 {
     LayoutUnit result = 0;
 
-    if (!renderer().style()->isFlippedLinesWritingMode()) {
-        // Annotations under the previous line may push us down.
-        if (prevRootBox() && prevRootBox()->hasAnnotationsAfter())
-            result = prevRootBox()->computeUnderAnnotationAdjustment(lineTop());
+    // Annotations under the previous line may push us down.
+    if (prevRootBox() && prevRootBox()->hasAnnotationsAfter())
+        result = prevRootBox()->computeUnderAnnotationAdjustment(lineTop());
 
-        if (!hasAnnotationsBefore())
-            return result;
+    if (!hasAnnotationsBefore())
+        return result;
 
-        // Annotations over this line may push us further down.
-        LayoutUnit highestAllowedPosition = prevRootBox() ? std::min(prevRootBox()->lineBottom(), lineTop()) + result : static_cast<LayoutUnit>(block().borderBefore());
-        result = computeOverAnnotationAdjustment(highestAllowedPosition);
-    } else {
-        // Annotations under this line may push us up.
-        if (hasAnnotationsBefore())
-            result = computeUnderAnnotationAdjustment(prevRootBox() ? prevRootBox()->lineBottom() : static_cast<LayoutUnit>(block().borderBefore()));
-
-        if (!prevRootBox() || !prevRootBox()->hasAnnotationsAfter())
-            return result;
-
-        // We have to compute the expansion for annotations over the previous line to see how much we should move.
-        LayoutUnit lowestAllowedPosition = std::max(prevRootBox()->lineBottom(), lineTop()) - result;
-        result = prevRootBox()->computeOverAnnotationAdjustment(lowestAllowedPosition);
-    }
+    // Annotations over this line may push us further down.
+    LayoutUnit highestAllowedPosition = prevRootBox() ? std::min(prevRootBox()->lineBottom(), lineTop()) + result : static_cast<LayoutUnit>(block().borderBefore());
+    result = computeOverAnnotationAdjustment(highestAllowedPosition);
 
     return result;
 }
 
 GapRects RootInlineBox::lineSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
                                          LayoutUnit selTop, LayoutUnit selHeight, const PaintInfo* paintInfo)
 {
     RenderObject::SelectionState lineState = selectionState();
 
     bool leftGap, rightGap;
@@ skipping 87 matching lines @@
     }
 
     return 0;
 }
 
 LayoutUnit RootInlineBox::selectionTop() const
 {
     LayoutUnit selectionTop = m_lineTop;
 
     if (m_hasAnnotationsBefore)
-        selectionTop -= !renderer().style()->isFlippedLinesWritingMode() ? computeOverAnnotationAdjustment(m_lineTop) : computeUnderAnnotationAdjustment(m_lineTop);
+        selectionTop -= computeOverAnnotationAdjustment(m_lineTop);
 
-    if (renderer().style()->isFlippedLinesWritingMode() || !prevRootBox())
+    if (!prevRootBox())
         return selectionTop;
 
     LayoutUnit prevBottom = prevRootBox()->selectionBottom();
     if (prevBottom < selectionTop && block().containsFloats()) {
         // This line has actually been moved further down, probably from a large line-height, but possibly because the
         // line was forced to clear floats.  If so, let's check the offsets, and only be willing to use the previous
         // line's bottom if the offsets are greater on both sides.
         LayoutUnit prevLeft = block().logicalLeftOffsetForLine(prevBottom, false);
         LayoutUnit prevRight = block().logicalRightOffsetForLine(prevBottom, false);
         LayoutUnit newLeft = block().logicalLeftOffsetForLine(selectionTop, false);
@@ skipping 26 matching lines @@
             }
         }
     }
 
     return top;
 }
 
 LayoutUnit RootInlineBox::selectionBottom() const
 {
     LayoutUnit selectionBottom = m_selectionBottom;
-
     if (m_hasAnnotationsAfter)
-        selectionBottom += !renderer().style()->isFlippedLinesWritingMode() ? computeUnderAnnotationAdjustment(m_lineBottom) : computeOverAnnotationAdjustment(m_lineBottom);
-
-    if (!renderer().style()->isFlippedLinesWritingMode() || !nextRootBox())
-        return selectionBottom;
-
-    LayoutUnit nextTop = nextRootBox()->selectionTop();
-    if (nextTop > selectionBottom && block().containsFloats()) {
-        // The next line has actually been moved further over, probably from a large line-height, but possibly because the
-        // line was forced to clear floats.  If so, let's check the offsets, and only be willing to use the next
-        // line's top if the offsets are greater on both sides.
-        LayoutUnit nextLeft = block().logicalLeftOffsetForLine(nextTop, false);
-        LayoutUnit nextRight = block().logicalRightOffsetForLine(nextTop, false);
-        LayoutUnit newLeft = block().logicalLeftOffsetForLine(selectionBottom, false);
-        LayoutUnit newRight = block().logicalRightOffsetForLine(selectionBottom, false);
-        if (nextLeft > newLeft || nextRight < newRight)
-            return selectionBottom;
-    }
-
-    return nextTop;
+        selectionBottom += computeUnderAnnotationAdjustment(m_lineBottom);
+    return selectionBottom;
 }
 
 int RootInlineBox::blockDirectionPointInLine() const
 {
-    return !block().style()->isFlippedBlocksWritingMode() ? std::max(lineTop(), selectionTop()) : std::min(lineBottom(), selectionBottom());
+    return std::max(lineTop(), selectionTop());
 }
 
 RenderBlockFlow& RootInlineBox::block() const
 {
     return toRenderBlockFlow(renderer());
 }
 
 static bool isEditableLeaf(InlineBox* leaf)
 {
     return leaf && leaf->renderer().node() && leaf->renderer().node()->hasEditableStyle();
@@ skipping 382 matching lines @@
 }
 
 #ifndef NDEBUG
 const char* RootInlineBox::boxName() const
 {
     return "RootInlineBox";
 }
 #endif
 
 } // namespace blink