Changeset 256458 in webkit

Timestamp:

Feb 12, 2020 11:07:24 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Display::Run should not have any geometry mutation functions.
​https://bugs.webkit.org/show_bug.cgi?id=207633
<rdar://problem/59386235>

Reviewed by Antti Koivisto.

Now that Display::Runs are constructed after merging the runs on the line, we don't need any of
these mutation functions.

• layout/displaytree/DisplayRun.h:

(WebCore::Display::Run::textContent const):
(WebCore::Display::Run::isLineBreak const):
(WebCore::Display::Run::lineIndex const):
(WebCore::Display::Run::setWidth): Deleted.
(WebCore::Display::Run::setTop): Deleted.
(WebCore::Display::Run::setlLeft): Deleted.
(WebCore::Display::Run::moveVertically): Deleted.
(WebCore::Display::Run::moveHorizontally): Deleted.
(WebCore::Display::Run::expandVertically): Deleted.
(WebCore::Display::Run::expandHorizontally): Deleted.
(WebCore::Display::Run::setTextContent): Deleted.
(WebCore::Display::Run::setExpansion): Deleted.
(WebCore::Display::Run::setImage): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/displaytree/DisplayRun.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-12  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Display::Run should not have any geometry mutation functions.
+        https://bugs.webkit.org/show_bug.cgi?id=207633
+        <rdar://problem/59386235>
+
+        Reviewed by Antti Koivisto.
+
+        Now that Display::Runs are constructed after merging the runs on the line, we don't need any of
+        these mutation functions.
+
+        * layout/displaytree/DisplayRun.h:
+        (WebCore::Display::Run::textContent const):
+        (WebCore::Display::Run::isLineBreak const):
+        (WebCore::Display::Run::lineIndex const):
+        (WebCore::Display::Run::setWidth): Deleted.
+        (WebCore::Display::Run::setTop): Deleted.
+        (WebCore::Display::Run::setlLeft): Deleted.
+        (WebCore::Display::Run::moveVertically): Deleted.
+        (WebCore::Display::Run::moveHorizontally): Deleted.
+        (WebCore::Display::Run::expandVertically): Deleted.
+        (WebCore::Display::Run::expandHorizontally): Deleted.
+        (WebCore::Display::Run::setTextContent): Deleted.
+        (WebCore::Display::Run::setExpansion): Deleted.
+        (WebCore::Display::Run::setImage): Deleted.
+
 2020-02-12  Megan Gardner  <megan_gardner@apple.com>
 

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

@@ -66 +66 @@
     Run(size_t lineIndex, const Layout::Box&, const InlineRect&, const InlineRect& inkOverflow, Expansion, Optional<TextContent> = WTF::nullopt);
 
-    size_t lineIndex() const { return m_lineIndex; }
-
     const InlineRect& rect() const { return m_rect; }
     const InlineRect& inkOverflow() const { return m_inkOverflow; }
@@ -80 +78 @@
     InlineLayoutUnit height() const { return m_rect.height(); }
 
-    void setWidth(InlineLayoutUnit width) { m_rect.setWidth(width); }
-    void setTop(InlineLayoutUnit top) { m_rect.setTop(top); }
-    void setlLeft(InlineLayoutUnit left) { m_rect.setLeft(left); }
-    void moveVertically(InlineLayoutUnit delta) { m_rect.moveVertically(delta); }
-    void moveHorizontally(InlineLayoutUnit delta) { m_rect.moveHorizontally(delta); }
-    void expandVertically(InlineLayoutUnit delta) { m_rect.expandVertically(delta); }
-    void expandHorizontally(InlineLayoutUnit delta) { m_rect.expandHorizontally(delta); }
-
-    void setTextContent(const TextContent&& textContent) { m_textContent.emplace(textContent); }
+    Optional<TextContent>& textContent() { return m_textContent; }
     const Optional<TextContent>& textContent() const { return m_textContent; }
-    Optional<TextContent>& textContent() { return m_textContent; }
+    // FIXME: This information should be preserved at Run construction time.
+    bool isLineBreak() const { return layoutBox().isLineBreakBox() || (textContent() && textContent()->content() == "\n" && style().preserveNewline()); }
 
     struct Expansion {
@@ -96 +87 @@
         InlineLayoutUnit horizontalExpansion { 0 };
     };
-    void setExpansion(Expansion expansion) { m_expansion = expansion; }
     Expansion expansion() const { return m_expansion; }
 
-    void setImage(CachedImage& image) { m_cachedImage = &image; }
     CachedImage* image() const { return m_cachedImage; }
-
-    // FIXME: This information should be preserved at Run construction time.
-    bool isLineBreak() const { return layoutBox().isLineBreakBox() || (textContent() && textContent()->content() == "\n" && style().preserveNewline()); }
 
     const Layout::Box& layoutBox() const { return *m_layoutBox; }
     const RenderStyle& style() const { return m_layoutBox->style(); }
+
+    size_t lineIndex() const { return m_lineIndex; }
 
 private: