Remove final instances of WritingMode in Sky.

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 125 matching lines @@
         const RoundedRect& shapeRect = style.getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view());
         m_shape = Shape::createLayoutBoxShape(shapeRect, margin);
         break;
     }
     }
 
     ASSERT(m_shape);
     return *m_shape;
 }
 
-inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer)
-{
-    // FIXME(sky): Remove
-    return renderer.borderBefore();
-}
-
-inline LayoutUnit borderAndPaddingBeforeInWritingMode(const RenderBox& renderer)
-{
-    // FIXME(sky): Remove
-    return renderer.borderAndPaddingBefore();
-}
-
 LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
 {
     switch (referenceBox(*m_renderer.style()->shapeOutside())) {
     case MarginBox: return -m_renderer.marginBefore(m_renderer.containingBlock()->style());
     case BorderBox: return LayoutUnit();
-    case PaddingBox: return borderBeforeInWritingMode(m_renderer);
-    case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer);
+    case PaddingBox: return m_renderer.borderBefore();
+    case ContentBox: return m_renderer.borderAndPaddingBefore();
     case BoxMissing: break;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
-inline LayoutUnit borderStartWithStyleForWritingMode(const RenderBox& renderer, const RenderStyle* style)
+inline LayoutUnit borderStartWithStyle(const RenderBox& renderer, const RenderStyle* style)
 {
     if (style->isLeftToRightDirection())
         return renderer.borderLeft();
     return renderer.borderRight();
 }
 
-inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const RenderBox& renderer, const RenderStyle* style)
+inline LayoutUnit borderAndPaddingStartWithStyle(const RenderBox& renderer, const RenderStyle* style)
 {
     if (style->isLeftToRightDirection())
         return renderer.borderLeft() + renderer.paddingLeft();
 
     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 PaddingBox: return borderStartWithStyle(m_renderer, m_renderer.containingBlock()->style());
+    case ContentBox: return borderAndPaddingStartWithStyle(m_renderer, m_renderer.containingBlock()->style());
     case BoxMissing: break;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
 
 bool ShapeOutsideInfo::isEnabledFor(const RenderBox& box)
 {
@@ skipping 35 matching lines @@
 {
     return FloatPoint(point.x() + logicalLeftOffset(), point.y() + logicalTopOffset());
 }
 
 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
 {
     return size;
 }
 
 } // namespace blink