Remove all writing mode function arguments and remove writing mode from RenderStyle.

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 81 matching lines @@
 static bool isValidRasterShapeRect(const LayoutRect& rect)
 {
     static double maxImageSizeBytes = 0;
     if (!maxImageSizeBytes) {
         size_t size32MaxBytes =  0xFFFFFFFF / 4; // Some platforms don't limit maxDecodedImageBytes.
         maxImageSizeBytes = std::min(size32MaxBytes, Platform::current()->maxDecodedImageBytes());
     }
     return (rect.width().toFloat() * rect.height().toFloat() * 4.0) < maxImageSizeBytes;
 }
 
-PassOwnPtr<Shape> ShapeOutsideInfo::createShapeForImage(StyleImage* styleImage, float shapeImageThreshold, WritingMode writingMode, float margin) const
+PassOwnPtr<Shape> ShapeOutsideInfo::createShapeForImage(StyleImage* styleImage, float shapeImageThreshold, float margin) const
 {
     const IntSize& imageSize = m_renderer.calculateImageIntrinsicDimensions(styleImage, roundedIntSize(m_referenceBoxLogicalSize), RenderImage::ScaleByEffectiveZoom);
     styleImage->setContainerSizeForRenderer(&m_renderer, imageSize, m_renderer.style()->effectiveZoom());
 
     const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
     const LayoutRect& imageRect = (m_renderer.isRenderImage())
         ? toRenderImage(m_renderer).replacedContentRect()
         : LayoutRect(LayoutPoint(), imageSize);
 
     if (!isValidRasterShapeRect(marginRect) || !isValidRasterShapeRect(imageRect)) {
         m_renderer.document().addConsoleMessage(ConsoleMessage::create(RenderingMessageSource, ErrorMessageLevel, "The shape-outside image is too large."));
-        return Shape::createEmptyRasterShape(writingMode, margin);
+        return Shape::createEmptyRasterShape(margin);
     }
 
     ASSERT(!styleImage->isPendingImage());
     RefPtr<Image> image = styleImage->image(const_cast<RenderBox*>(&m_renderer), imageSize);
 
-    return Shape::createRasterShape(image.get(), shapeImageThreshold, imageRect, marginRect, writingMode, margin);
+    return Shape::createRasterShape(image.get(), shapeImageThreshold, imageRect, marginRect, margin);
 }
 
 const Shape& ShapeOutsideInfo::computedShape() const
 {
     if (Shape* shape = m_shape.get())
         return *shape;
 
     const RenderStyle& style = *m_renderer.style();
     ASSERT(m_renderer.containingBlock());
-    const RenderStyle& containingBlockStyle = *m_renderer.containingBlock()->style();
-
-    WritingMode writingMode = containingBlockStyle.writingMode();
     LayoutUnit maximumValue = m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : LayoutUnit();
     float margin = floatValueForLength(m_renderer.style()->shapeMargin(), maximumValue.toFloat());
 
     float shapeImageThreshold = style.shapeImageThreshold();
     ASSERT(style.shapeOutside());
     const ShapeValue& shapeValue = *style.shapeOutside();
 
     switch (shapeValue.type()) {
     case ShapeValue::Shape:
         ASSERT(shapeValue.shape());
-        m_shape = Shape::createShape(shapeValue.shape(), m_referenceBoxLogicalSize, writingMode, margin);
+        m_shape = Shape::createShape(shapeValue.shape(), m_referenceBoxLogicalSize, margin);
         break;
     case ShapeValue::Image:
         ASSERT(shapeValue.isImageValid());
-        m_shape = createShapeForImage(shapeValue.image(), shapeImageThreshold, writingMode, margin);
+        m_shape = createShapeForImage(shapeValue.image(), shapeImageThreshold, margin);
         break;
     case ShapeValue::Box: {
         const RoundedRect& shapeRect = style.getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view());
-        m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin);
+        m_shape = Shape::createLayoutBoxShape(shapeRect, margin);
         break;
     }
     }
 
     ASSERT(m_shape);
     return *m_shape;
 }
 
-inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode)
+inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer)
 {
     // FIXME(sky): Remove
     return renderer.borderBefore();
 }
 
-inline LayoutUnit borderAndPaddingBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode)
+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, m_renderer.containingBlock()->style()->writingMode());
-    case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer, m_renderer.containingBlock()->style()->writingMode());
+    case PaddingBox: return borderBeforeInWritingMode(m_renderer);
+    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()) {
@@ skipping 119 matching lines @@
 }
 
 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
 {
     if (!m_renderer.style()->isHorizontalWritingMode())
         return size.transposedSize();
     return size;
 }
 
 } // namespace blink