Delete a ton more dead vertical writing mode code.

sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 30 matching lines @@
 
 CSSBoxType referenceBox(const ShapeValue& shapeValue)
 {
     if (shapeValue.cssBox() == BoxMissing)
         return MarginBox;
     return shapeValue.cssBox();
 }
 
 void ShapeOutsideInfo::setReferenceBoxLogicalSize(LayoutSize newReferenceBoxLogicalSize)
 {
-    bool isHorizontalWritingMode = m_renderer.containingBlock()->style()->isHorizontalWritingMode();
     switch (referenceBox(*m_renderer.style()->shapeOutside())) {
     case MarginBox:
-        if (isHorizontalWritingMode)
-            newReferenceBoxLogicalSize.expand(m_renderer.marginWidth(), m_renderer.marginHeight());
-        else
-            newReferenceBoxLogicalSize.expand(m_renderer.marginHeight(), m_renderer.marginWidth());
+        newReferenceBoxLogicalSize.expand(m_renderer.marginWidth(), m_renderer.marginHeight());
         break;
     case BorderBox:
         break;
     case PaddingBox:
-        if (isHorizontalWritingMode)
-            newReferenceBoxLogicalSize.shrink(m_renderer.borderWidth(), m_renderer.borderHeight());
-        else
-            newReferenceBoxLogicalSize.shrink(m_renderer.borderHeight(), m_renderer.borderWidth());
+        newReferenceBoxLogicalSize.shrink(m_renderer.borderWidth(), m_renderer.borderHeight());
         break;
     case ContentBox:
-        if (isHorizontalWritingMode)
-            newReferenceBoxLogicalSize.shrink(m_renderer.borderAndPaddingWidth(), m_renderer.borderAndPaddingHeight());
-        else
-            newReferenceBoxLogicalSize.shrink(m_renderer.borderAndPaddingHeight(), m_renderer.borderAndPaddingWidth());
+        newReferenceBoxLogicalSize.shrink(m_renderer.borderAndPaddingWidth(), m_renderer.borderAndPaddingHeight());
         break;
     case BoxMissing:
         ASSERT_NOT_REACHED();
         break;
     }
 
     if (m_referenceBoxLogicalSize == newReferenceBoxLogicalSize)
         return;
     markShapeAsDirty();
     m_referenceBoxLogicalSize = newReferenceBoxLogicalSize;
@@ skipping 92 matching lines @@
     case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer);
     case BoxMissing: break;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
 inline LayoutUnit borderStartWithStyleForWritingMode(const RenderBox& renderer, const RenderStyle* style)
 {
-    if (style->isHorizontalWritingMode()) {
-        if (style->isLeftToRightDirection())
-            return renderer.borderLeft();
-
-        return renderer.borderRight();
-    }
     if (style->isLeftToRightDirection())
-        return renderer.borderTop();
-
-    return renderer.borderBottom();
+        return renderer.borderLeft();
+    return renderer.borderRight();
 }
 
 inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const RenderBox& renderer, const RenderStyle* style)
 {
-    if (style->isHorizontalWritingMode()) {
-        if (style->isLeftToRightDirection())
-            return renderer.borderLeft() + renderer.paddingLeft();
+    if (style->isLeftToRightDirection())
+        return renderer.borderLeft() + renderer.paddingLeft();
 
-        return renderer.borderRight() + renderer.paddingRight();
-    }
-    if (style->isLeftToRightDirection())
-        return renderer.borderTop() + renderer.paddingTop();
-
-    return renderer.borderBottom() + renderer.paddingBottom();
+    return renderer.borderRight() + renderer.paddingRight();
 }
 
 LayoutUnit ShapeOutsideInfo::logicalLeftOffset() const
 {
     switch (referenceBox(*m_renderer.style()->shapeOutside())) {
     case MarginBox: return -m_renderer.marginStart(m_renderer.containingBlock()->style());
     case BorderBox: return LayoutUnit();
     case PaddingBox: return borderStartWithStyleForWritingMode(m_renderer, m_renderer.containingBlock()->style());
     case ContentBox: return borderAndPaddingStartWithStyleForWritingMode(m_renderer, m_renderer.containingBlock()->style());
     case BoxMissing: break;
@@ skipping 26 matching lines @@
 {
     // FIXME(sky): Remove this.
     return ShapeOutsideDeltas();
 }
 
 LayoutRect ShapeOutsideInfo::computedShapePhysicalBoundingBox() const
 {
     LayoutRect physicalBoundingBox = computedShape().shapeMarginLogicalBoundingBox();
     physicalBoundingBox.setX(physicalBoundingBox.x() + logicalLeftOffset());
 
-    if (m_renderer.style()->isFlippedBlocksWritingMode())
-        physicalBoundingBox.setY(m_renderer.logicalHeight() - physicalBoundingBox.maxY());
-    else
-        physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
-
-    if (!m_renderer.style()->isHorizontalWritingMode())
-        physicalBoundingBox = physicalBoundingBox.transposedRect();
-    else
-        physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
+    // FIXME(sky): Doing this twice doesn't seem right, but it's what the old code did.
+    physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
+    physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
 
     return physicalBoundingBox;
 }
 
 FloatPoint ShapeOutsideInfo::shapeToRendererPoint(FloatPoint point) const
 {
-    FloatPoint result = FloatPoint(point.x() + logicalLeftOffset(), point.y() + logicalTopOffset());
-    if (m_renderer.style()->isFlippedBlocksWritingMode())
-        result.setY(m_renderer.logicalHeight() - result.y());
-    if (!m_renderer.style()->isHorizontalWritingMode())
-        result = result.transposedPoint();
-    return result;
+    return FloatPoint(point.x() + logicalLeftOffset(), point.y() + logicalTopOffset());
 }
 
 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
 {
-    if (!m_renderer.style()->isHorizontalWritingMode())
-        return size.transposedSize();
     return size;
 }
 
 } // namespace blink