Changeset 250482 in webkit

Timestamp:

Sep 28, 2019 7:30:40 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Line::Box should have a const public interface
​https://bugs.webkit.org/show_bug.cgi?id=202336
<rdar://problem/55798628>

Reviewed by Antti Koivisto.

Clean up Line::Box interface.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::close):

• layout/inlineformatting/InlineLine.h:

(WebCore::Layout::Line::Run::displayRun const):
(WebCore::Layout::Line::Run::isVisuallyEmpty const):
(WebCore::Layout::Line::Run::expand):
(WebCore::Layout::Line::Run::displayRun): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLine.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-28  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Line::Box should have a const public interface
+        https://bugs.webkit.org/show_bug.cgi?id=202336
+        <rdar://problem/55798628>
+
+        Reviewed by Antti Koivisto.
+
+        Clean up Line::Box interface.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::close):
+        * layout/inlineformatting/InlineLine.h:
+        (WebCore::Layout::Line::Run::displayRun const):
+        (WebCore::Layout::Line::Run::isVisuallyEmpty const):
+        (WebCore::Layout::Line::Run::expand):
+        (WebCore::Layout::Line::Run::displayRun): Deleted.
+
 2019-09-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp

@@ -179 +179 @@
         ASSERT(previousRun->isText());
         ASSERT(currentRun->isText());
-        auto& previousDisplayRun = previousRun->displayRun();
-        auto& currentDisplayRun = currentRun->displayRun();
-        previousDisplayRun.expandHorizontally(currentDisplayRun.logicalWidth());
-        previousDisplayRun.textContext()->expand(currentDisplayRun.textContext()->length());
+        previousRun->expand(*currentRun);
         m_runList.remove(index);
     }

trunk/Source/WebCore/layout/inlineformatting/InlineLine.h

@@ -70 +70 @@
 
         const Display::Run& displayRun() const { return m_displayRun; }
-        Display::Run& displayRun() { return m_displayRun; }
         const Box& layoutBox() const { return m_inlineItem.layoutBox(); }
 
         const Display::Rect& logicalRect() const { return m_displayRun.logicalRect(); }
+        bool isVisuallyEmpty() const { return m_isVisuallyEmpty; }
 
         bool isText() const { return m_inlineItem.isText(); }
@@ -81 +81 @@
         bool isContainerEnd() const { return m_inlineItem.isContainerEnd(); }
 
-        bool isVisuallyEmpty() const { return m_isVisuallyEmpty; }
-        bool isWhitespace() const;
-        bool canBeExtended() const;
-
     private:
         friend class Line;
@@ -90 +86 @@
         void moveVertically(LayoutUnit offset) { m_displayRun.moveVertically(offset); }
         void moveHorizontally(LayoutUnit offset) { m_displayRun.moveHorizontally(offset); }
+
+        void expand(const Run&);
+
         void setVisuallyIsEmpty() { m_isVisuallyEmpty = true; }
+
+        bool isWhitespace() const;
+        bool canBeExtended() const;
 
         const InlineItem& m_inlineItem;
@@ -142 +144 @@
 };
 
+inline void Line::Run::expand(const Run& other)
+{
+    ASSERT(isText());
+    ASSERT(other.isText());
+
+    auto& otherDisplayRun = other.displayRun();
+    m_displayRun.expandHorizontally(otherDisplayRun.logicalWidth());
+    m_displayRun.textContext()->expand(otherDisplayRun.textContext()->length());
+}
+
 }
 }