Convert some Shape code to use references

Source/core/rendering/shapes/ShapeInfo.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 40 matching lines @@
 {
     if (renderBox->isRenderImage())
         return toRenderImage(renderBox)->replacedContentRect();
 
     ASSERT(styleImage.cachedImage());
     ASSERT(styleImage.cachedImage()->hasImage());
     return LayoutRect(LayoutPoint(), styleImage.cachedImage()->image()->size());
 }
 
 template<class RenderType>
-const Shape* ShapeInfo<RenderType>::computedShape() const
+const Shape& ShapeInfo<RenderType>::computedShape() const
 {
     if (Shape* shape = m_shape.get())
-        return shape;
+        return *shape;
 
-    WritingMode writingMode = m_renderer->style()->writingMode();
-    Length margin = m_renderer->style()->shapeMargin();
-    Length padding = m_renderer->style()->shapePadding();
-    float shapeImageThreshold = m_renderer->style()->shapeImageThreshold();
+    WritingMode writingMode = m_renderer.style()->writingMode();
+    Length margin = m_renderer.style()->shapeMargin();
+    Length padding = m_renderer.style()->shapePadding();
+    float shapeImageThreshold = m_renderer.style()->shapeImageThreshold();
     const ShapeValue* shapeValue = this->shapeValue();
     ASSERT(shapeValue);
 
     switch (shapeValue->type()) {
     case ShapeValue::Shape:
         ASSERT(shapeValue->shape());
         m_shape = Shape::createShape(shapeValue->shape(), m_referenceBoxLogicalSize, writingMode, margin, padding);
         break;
     case ShapeValue::Image: {
         ASSERT(shapeValue->image());
         const StyleImage& styleImage = *(shapeValue->image());
-        m_shape = Shape::createRasterShape(styleImage, shapeImageThreshold, getShapeImageRect(styleImage, m_renderer), m_referenceBoxLogicalSize, writingMode, margin, padding);
+        m_shape = Shape::createRasterShape(styleImage, shapeImageThreshold, getShapeImageRect(styleImage, &m_renderer), m_referenceBoxLogicalSize, writingMode, margin, padding);
         break;
     }
     case ShapeValue::Box: {
-        const RoundedRect& shapeRect = m_renderer->style()->getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer->view());
+        const RoundedRect& shapeRect = m_renderer.style()->getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view());
         m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin, padding);
         break;
     }
     case ShapeValue::Outside:
         // Outside should have already resolved to a different shape value.
         ASSERT_NOT_REACHED();
     }
 
     ASSERT(m_shape);
-    return m_shape.get();
+    return *m_shape;
 }
 
 template<class RenderType>
 SegmentList ShapeInfo<RenderType>::computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight) const
 {
     ASSERT(lineHeight >= 0);
     SegmentList segments;
 
     getIntervals((lineTop - logicalTopOffset()), std::min(lineHeight, shapeLogicalBottom() - lineTop), segments);
 
     for (size_t i = 0; i < segments.size(); i++) {
         segments[i].logicalLeft += logicalLeftOffset();
         segments[i].logicalRight += logicalLeftOffset();
     }
 
     return segments;
 }
 
 template class ShapeInfo<RenderBlock>;
 template class ShapeInfo<RenderBox>;
 }