Rename shapeSize and others to make ShapeInfo and friends easier to understand

Source/core/rendering/shapes/ShapeInfo.h

 /*
 * 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 50 matching lines @@
         return staticInfoMap;
     }
 };
 
 template<class RenderType>
 class ShapeInfo {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     virtual ~ShapeInfo() { }
 
-    void setShapeSize(LayoutUnit logicalWidth, LayoutUnit logicalHeight)
+    void setReferenceBoxLogicalSize(LayoutSize newReferenceBoxLogicalSize)
     {
-        switch (resolvedLayoutBox()) {
+        switch (referenceBox()) {
         case MarginBox:
-            logicalHeight += m_renderer->marginLogicalHeight();
-            logicalWidth += m_renderer->marginLogicalWidth();
+            newReferenceBoxLogicalSize.expand(m_renderer->marginLogicalWidth(), m_renderer->marginLogicalHeight());
             break;
         case BorderBox:
             break;
         case PaddingBox:
-            logicalHeight -= m_renderer->borderLogicalHeight();
-            logicalWidth -= m_renderer->borderLogicalWidth();
+            newReferenceBoxLogicalSize.shrink(m_renderer->borderLogicalWidth(), m_renderer->borderLogicalHeight());
             break;
         case ContentBox:
-            logicalHeight -= m_renderer->borderAndPaddingLogicalHeight();
-            logicalWidth -= m_renderer->borderAndPaddingLogicalWidth();
+            newReferenceBoxLogicalSize.shrink(m_renderer->borderAndPaddingLogicalWidth(), m_renderer->borderAndPaddingLogicalHeight());
             break;
         case BoxMissing:
             // A non-missing box value must be supplied.
             ASSERT_NOT_REACHED();
         }
 
-        LayoutSize newLogicalSize(logicalWidth, logicalHeight);
-        if (m_shapeLogicalSize == newLogicalSize)
+        if (m_referenceBoxLogicalSize == newReferenceBoxLogicalSize)
             return;
-        dirtyShapeSize();
-        m_shapeLogicalSize = newLogicalSize;
+        markShapeAsDirty();
+        m_referenceBoxLogicalSize = newReferenceBoxLogicalSize;
     }
 
     SegmentList computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight) const;
 
     LayoutUnit shapeLogicalTop() const { return computedShapeLogicalBoundingBox().y() + logicalTopOffset(); }
     LayoutUnit shapeLogicalBottom() const { return computedShapeLogicalBoundingBox().maxY() + logicalTopOffset(); }
     LayoutUnit shapeLogicalLeft() const { return computedShapeLogicalBoundingBox().x() + logicalLeftOffset(); }
     LayoutUnit shapeLogicalRight() const { return computedShapeLogicalBoundingBox().maxX() + logicalLeftOffset(); }
     LayoutUnit shapeLogicalWidth() const { return computedShapeLogicalBoundingBox().width(); }
     LayoutUnit shapeLogicalHeight() const { return computedShapeLogicalBoundingBox().height(); }
 
-    LayoutUnit logicalLineTop() const { return m_shapeLineTop + logicalTopOffset(); }
-    LayoutUnit logicalLineBottom() const { return m_shapeLineTop + m_lineHeight + logicalTopOffset(); }
+    LayoutUnit logicalLineTop() const { return m_referenceBoxLineTop + logicalTopOffset(); }
+    LayoutUnit logicalLineBottom() const { return m_referenceBoxLineTop + m_lineHeight + logicalTopOffset(); }
 
-    LayoutUnit shapeContainingBlockHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
+    LayoutUnit shapeContainingBlockHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_referenceBoxLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_referenceBoxLogicalSize.height(); }
 
     virtual bool lineOverlapsShapeBounds() const = 0;
 
-    void dirtyShapeSize() { m_shape.clear(); }
-    bool shapeSizeDirty() { return !m_shape.get(); }
+    void markShapeAsDirty() { m_shape.clear(); }
+    bool isShapeDirty() { return !m_shape.get(); }
     const RenderType* owner() const { return m_renderer; }
-    LayoutSize shapeSize() const { return m_shapeLogicalSize; }
+    LayoutSize shapeSize() const { return m_referenceBoxLogicalSize; }
 
 protected:
     ShapeInfo(const RenderType* renderer): m_renderer(renderer) { }
 
     const Shape* computedShape() const;
 
-    virtual LayoutBox resolvedLayoutBox() const = 0;
+    virtual LayoutBox referenceBox() const = 0;

[leviw_travelin_and_unemployed, 2014/03/03 23:07:20]

I'm not sure how much is me understanding the spec and implementation better, or
how much is this new naming, but all of this is just way clearer to me. Thank
you.

     virtual LayoutRect computedShapeLogicalBoundingBox() const = 0;
     virtual ShapeValue* shapeValue() const = 0;
     virtual void getIntervals(LayoutUnit, LayoutUnit, SegmentList&) const = 0;
 
     LayoutUnit logicalTopOffset() const
     {
-        switch (resolvedLayoutBox()) {
+        switch (referenceBox()) {
         case MarginBox:
             return -m_renderer->marginBefore();
         case BorderBox:
             return LayoutUnit();
         case PaddingBox:
             return m_renderer->borderBefore();
         case ContentBox:
             return m_renderer->borderAndPaddingBefore();
         case BoxMissing:
             // A non-missing box value must be supplied.
             ASSERT_NOT_REACHED();
         }
         return LayoutUnit();
     }
 
     LayoutUnit logicalLeftOffset() const
     {
-        switch (resolvedLayoutBox()) {
+        switch (referenceBox()) {
         case MarginBox:
             return -m_renderer->marginStart();
         case BorderBox:
             return LayoutUnit();
         case PaddingBox:
             return m_renderer->borderStart();
         case ContentBox:
             return m_renderer->borderAndPaddingStart();
         case BoxMissing:
             // A non-missing box value must be supplied.
             ASSERT_NOT_REACHED();
         }
         return LayoutUnit();
     }
 
-    LayoutUnit m_shapeLineTop;
+    LayoutUnit m_referenceBoxLineTop;
     LayoutUnit m_lineHeight;
 
     const RenderType* m_renderer;
 
 private:
     mutable OwnPtr<Shape> m_shape;
-    LayoutSize m_shapeLogicalSize;
+    LayoutSize m_referenceBoxLogicalSize;
 };
 
 bool checkShapeImageOrigin(Document&, ImageResource&);
 
 }
 #endif