Changeset 231846 in webkit

Timestamp:

May 16, 2018 7:49:55 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC] Make Display::Box box sizing aware
​https://bugs.webkit.org/show_bug.cgi?id=185649

Reviewed by Antti Koivisto.

Display::Box::width() == Display::Box::contentBox().width() <= box-sizing: content-box; (initial and default value)
Display::Box::width() == Display::Box::borderBox().width() <= box-sizing: border-box;

• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::createDisplayBox):

• layout/displaytree/DisplayBox.cpp:

(WebCore::Display::Box::Box):
(WebCore::Display::Box::marginBox const):
(WebCore::Display::Box::borderBox const):
(WebCore::Display::Box::paddingBox const):
(WebCore::Display::Box::contentBox const):

• layout/displaytree/DisplayBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (1 diff)
• layout/displaytree/DisplayBox.cpp (modified) (5 diffs)
• layout/displaytree/DisplayBox.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Make Display::Box box sizing aware
+        https://bugs.webkit.org/show_bug.cgi?id=185649
+
+        Reviewed by Antti Koivisto.
+
+        Display::Box::width() == Display::Box::contentBox().width() <= box-sizing: content-box; (initial and default value)
+        Display::Box::width() == Display::Box::borderBox().width() <= box-sizing: border-box;
+
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::createDisplayBox):
+        * layout/displaytree/DisplayBox.cpp:
+        (WebCore::Display::Box::Box):
+        (WebCore::Display::Box::marginBox const):
+        (WebCore::Display::Box::borderBox const):
+        (WebCore::Display::Box::paddingBox const):
+        (WebCore::Display::Box::contentBox const):
+        * layout/displaytree/DisplayBox.h:
+
 2018-05-16  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -65 +65 @@
 Display::Box& LayoutContext::createDisplayBox(const Box& layoutBox)
 {
-    std::unique_ptr<Display::Box> displayBox(new Display::Box());
+    std::unique_ptr<Display::Box> displayBox(new Display::Box(layoutBox.style().boxSizing()));
     auto* displayBoxPtr = displayBox.get();
     m_layoutToDisplayBox.add(&layoutBox, WTFMove(displayBox));

trunk/Source/WebCore/layout/displaytree/DisplayBox.cpp

@@ -36 +36 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(Box);
 
-Box::Box()
+Box::Box(EBoxSizing boxSizing)
+    : m_boxSizing(boxSizing)
 {
 }
@@ -47 +48 @@
 {
     ASSERT(m_hasValidMargin);
-    auto marginBox = rect();
-    auto topLeftMargin = LayoutSize(m_marginLeft, m_marginTop);
-    marginBox.inflate(topLeftMargin);
+    auto marginBox = borderBox();
 
-    auto bottomRightMargin = LayoutSize(m_marginRight, m_marginBottom);
-    marginBox.expand(bottomRightMargin);
+    marginBox.shiftXEdgeTo(marginBox.x() + m_marginLeft);
+    marginBox.shiftYEdgeTo(marginBox.y() + m_marginTop);
+    marginBox.shiftMaxXEdgeTo(marginBox.maxX() - m_marginRight);
+    marginBox.shiftMaxYEdgeTo(marginBox.maxY() - m_marginBottom);
+
     return marginBox;
 }
@@ -58 +60 @@
 LayoutRect Box::borderBox() const
 {
-    return LayoutRect(LayoutPoint(0, 0), size());
+    if (m_boxSizing == BORDER_BOX)
+        return LayoutRect( { }, size());
+
+    // Width is content box.
+    ASSERT(m_hasValidBorder);
+    ASSERT(m_hasValidPadding);
+    auto borderBoxSize = size();
+    borderBoxSize.expand(borderLeft() + paddingLeft() + paddingRight() + borderRight() , borderTop() + paddingTop() + paddingBottom() + borderBottom());
+    return LayoutRect( { }, borderBoxSize);
 }
 
@@ -65 +75 @@
     ASSERT(m_hasValidBorder);
     auto paddingBox = borderBox();
-    auto topLeftBorder = LayoutSize(m_borderLeft, m_borderTop);
-    paddingBox.inflate(-topLeftBorder);
 
-    auto bottomRightBorder = LayoutSize(m_borderRight, m_borderBottom);
-    paddingBox.expand(-bottomRightBorder);
+    paddingBox.shiftXEdgeTo(paddingBox.x() + m_borderLeft);
+    paddingBox.shiftYEdgeTo(paddingBox.y() + m_borderTop);
+    paddingBox.shiftMaxXEdgeTo(paddingBox.maxX() - m_borderRight);
+    paddingBox.shiftMaxYEdgeTo(paddingBox.maxY() - m_borderBottom);
+
     return paddingBox;
 }
@@ -75 +86 @@
 LayoutRect Box::contentBox() const
 {
+    if (m_boxSizing == CONTENT_BOX)
+        return LayoutRect(LayoutPoint(0, 0), size());
+
+    // Width is border box.
     ASSERT(m_hasValidPadding);
     auto contentBox = paddingBox();
-    auto topLeftPadding = LayoutSize(m_paddingLeft, m_paddingTop);
-    contentBox.inflate(-topLeftPadding);
-    
-    auto bottomRightPadding = LayoutSize(m_paddingRight, m_paddingBottom);
-    contentBox.expand(-bottomRightPadding);
+
+    contentBox.shiftXEdgeTo(contentBox.x() + m_paddingLeft);
+    contentBox.shiftYEdgeTo(contentBox.y() + m_paddingTop);
+    contentBox.shiftMaxXEdgeTo(contentBox.maxX() - m_paddingRight);
+    contentBox.shiftMaxYEdgeTo(contentBox.maxY() - m_paddingBottom);
+
     return contentBox;
 }

trunk/Source/WebCore/layout/displaytree/DisplayBox.h

@@ -31 +31 @@
 #include "LayoutRect.h"
 #include "LayoutUnit.h"
+#include "RenderStyleConstants.h"
 #include <wtf/IsoMalloc.h>
 
@@ -87 +88 @@
 
 private:
-    Box();
+    Box(EBoxSizing);
 
     void setRect(const LayoutRect&);
@@ -142 +143 @@
     LayoutUnit m_paddingRight;
 
+    EBoxSizing m_boxSizing { CONTENT_BOX };
+
 #if !ASSERT_DISABLED
     bool m_hasValidTop { false };