Changeset 143410 in webkit

Timestamp:

Feb 19, 2013, 4:45:40 PM (12 years ago)

Author:

eae@chromium.org

Message:

Change computeStickyPositionConstraints to use LayoutBoxExtent for margins
​https://bugs.webkit.org/show_bug.cgi?id=108872

Reviewed by Levi Weintraub.

Change RenderBoxModelObject::computeStickyPositionConstraints to
use a LayoutBoxExtent to represent margins.

No new tests, no change in functionality.

• platform/graphics/LayoutRect.h:

(WebCore::LayoutRect::contract):
Add version contract methods that takes a LayoutBoxExtent object.

• platform/graphics/LayoutSize.h:

(WebCore::LayoutSize::shrink):
Add shrink method.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::computeStickyPositionConstraints):
Change to use a LayoutBoxExtent object to represent margins.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/LayoutRect.h (modified) (1 diff)
• platform/graphics/LayoutSize.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Emil A Eklund  <eae@chromium.org>
+
+        Change computeStickyPositionConstraints to use LayoutBoxExtent for margins
+        https://bugs.webkit.org/show_bug.cgi?id=108872
+
+        Reviewed by Levi Weintraub.
+        
+        Change RenderBoxModelObject::computeStickyPositionConstraints to
+        use a LayoutBoxExtent to represent margins.
+
+        No new tests, no change in functionality.
+
+        * platform/graphics/LayoutRect.h:
+        (WebCore::LayoutRect::contract):
+        Add version contract methods that takes a LayoutBoxExtent object.
+        
+        * platform/graphics/LayoutSize.h:
+        (WebCore::LayoutSize::shrink):
+        Add shrink method.
+        
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::computeStickyPositionConstraints):
+        Change to use a LayoutBoxExtent object to represent margins.
+
 2013-02-19  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/Source/WebCore/platform/graphics/LayoutRect.h

@@ -108 +108 @@
     void expand(LayoutUnit dw, LayoutUnit dh) { m_size.expand(dw, dh); }
     void contract(const LayoutSize& size) { m_size -= size; }
+    void contract(const LayoutBoxExtent& box)
+    {
+        m_location.move(box.left(), box.top());
+        m_size.shrink(box.left() + box.right(), box.top() + box.bottom());
+    }
     void contract(LayoutUnit dw, LayoutUnit dh) { m_size.expand(-dw, -dh); }
 

trunk/Source/WebCore/platform/graphics/LayoutSize.h

@@ -71 +71 @@
         m_width += width;
         m_height += height;
+    }
+    
+    void shrink(LayoutUnit width, LayoutUnit height)
+    {
+        m_width -= width;
+        m_height -= height;
     }
     

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -476 +476 @@
 
     LayoutRect containerContentRect = containingBlock->contentBoxRect();
+    LayoutUnit maxWidth = containingBlock->availableLogicalWidth();
 
     // Sticky positioned element ignore any override logical width on the containing block (as they don't call
     // containingBlockLogicalWidthForContent). It's unclear whether this is totally fine.
-    LayoutUnit minLeftMargin = minimumValueForLength(style()->marginLeft(), containingBlock->availableLogicalWidth(), view());
-    LayoutUnit minTopMargin = minimumValueForLength(style()->marginTop(), containingBlock->availableLogicalWidth(), view());
-    LayoutUnit minRightMargin = minimumValueForLength(style()->marginRight(), containingBlock->availableLogicalWidth(), view());
-    LayoutUnit minBottomMargin = minimumValueForLength(style()->marginBottom(), containingBlock->availableLogicalWidth(), view());
+    LayoutBoxExtent minMargin(minimumValueForLength(style()->marginTop(), maxWidth, view()),
+        minimumValueForLength(style()->marginRight(), maxWidth, view()),
+        minimumValueForLength(style()->marginBottom(), maxWidth, view()),
+        minimumValueForLength(style()->marginLeft(), maxWidth, view()));
 
     // Compute the container-relative area within which the sticky element is allowed to move.
-    containerContentRect.move(minLeftMargin, minTopMargin);
-    containerContentRect.contract(minLeftMargin + minRightMargin, minTopMargin + minBottomMargin);
+    containerContentRect.contract(minMargin);
     // Map to the view to avoid including page scale factor.
     constraints.setAbsoluteContainingBlockRect(containingBlock->localToContainerQuad(FloatRect(containerContentRect), view()).boundingBox());