Changeset 155626 in webkit

Timestamp:

Sep 12, 2013 9:49:39 AM (11 years ago)

Author:

zoltan@webkit.org

Message:

[CSS Shapes] Turn shape's logicalwidth/height into a LayoutSize
​https://bugs.webkit.org/show_bug.cgi?id=121187

Reviewed by David Hyatt.

No new tests, no behavior change.

• rendering/shapes/ShapeInfo.cpp:

(WebCore::::computedShape):

• rendering/shapes/ShapeInfo.h:

(WebCore::ShapeInfo::setShapeSize):
(WebCore::ShapeInfo::shapeContainingBlockHeight):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/shapes/ShapeInfo.cpp (modified) (2 diffs)
• rendering/shapes/ShapeInfo.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-12  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Shapes] Turn shape's logicalwidth/height into a LayoutSize
+        https://bugs.webkit.org/show_bug.cgi?id=121187
+
+        Reviewed by David Hyatt.
+
+        No new tests, no behavior change.
+
+        * rendering/shapes/ShapeInfo.cpp:
+        (WebCore::::computedShape):
+        * rendering/shapes/ShapeInfo.h:
+        (WebCore::ShapeInfo::setShapeSize):
+        (WebCore::ShapeInfo::shapeContainingBlockHeight):
+
 2013-09-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp

@@ -46 +46 @@
         return shape;
 
-    const LayoutSize logicalBoxSize(m_shapeLogicalWidth, m_shapeLogicalHeight);
     WritingMode writingMode = m_renderer->style()->writingMode();
     Length margin = m_renderer->style()->shapeMargin();
@@ -56 +55 @@
     case ShapeValue::Shape:
         ASSERT(shapeValue->shape());
-        m_shape = Shape::createShape(shapeValue->shape(), logicalBoxSize, writingMode, margin, padding);
+        m_shape = Shape::createShape(shapeValue->shape(), m_shapeLogicalSize, writingMode, margin, padding);
         break;
     case ShapeValue::Image:
         ASSERT(shapeValue->image());
-        m_shape = Shape::createShape(shapeValue->image(), 0, logicalBoxSize, writingMode, margin, padding);
+        m_shape = Shape::createShape(shapeValue->image(), 0, m_shapeLogicalSize, writingMode, margin, padding);
         break;
     default:

trunk/Source/WebCore/rendering/shapes/ShapeInfo.h

@@ -73 +73 @@
     void setShapeSize(LayoutUnit logicalWidth, LayoutUnit logicalHeight)
     {
-        if (m_renderer->style()->boxSizing() == CONTENT_BOX) {
-            logicalWidth -= m_renderer->borderAndPaddingLogicalWidth();
-            logicalHeight -= m_renderer->borderAndPaddingLogicalHeight();
-        }
+        LayoutSize newLogicalSize(logicalWidth, logicalHeight);
 
-        if (m_shapeLogicalWidth == logicalWidth && m_shapeLogicalHeight == logicalHeight)
+        if (m_renderer->style()->boxSizing() == CONTENT_BOX)
+            newLogicalSize -= LayoutSize(m_renderer->borderAndPaddingLogicalWidth(), m_renderer->borderAndPaddingLogicalHeight());
+
+        if (m_shapeLogicalSize == newLogicalSize)
             return;
         dirtyShapeSize();
-        m_shapeLogicalWidth = logicalWidth;
-        m_shapeLogicalHeight = logicalHeight;
+        m_shapeLogicalSize = newLogicalSize;
     }
 
@@ -98 +97 @@
     LayoutUnit logicalLineBottom() const { return m_shapeLineTop + m_lineHeight + logicalTopOffset(); }
 
-    LayoutUnit shapeContainingBlockHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalHeight + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalHeight; }
+    LayoutUnit shapeContainingBlockHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
 
     bool lineOverlapsShapeBounds() const { return logicalLineTop() < shapeLogicalBottom() && shapeLogicalTop() <= logicalLineBottom(); }
@@ -123 +122 @@
 private:
     mutable OwnPtr<Shape> m_shape;
-
-    LayoutUnit m_shapeLogicalWidth;
-    LayoutUnit m_shapeLogicalHeight;
+    LayoutSize m_shapeLogicalSize;
 };
 }