Changeset 267418 in webkit

Timestamp:

Sep 22, 2020, 10:33:21 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC] FormattingState should never be copied.
​https://bugs.webkit.org/show_bug.cgi?id=216833

Reviewed by Antti Koivisto.

Even when running a throw-away layout, we should not copy the state object but instead generate a new one for the subtree.
These objects should never be copied in general.

• layout/FormattingState.h:
• layout/LayoutState.h:
• layout/tableformatting/TableFormattingContextGeometry.cpp:

(WebCore::Layout::TableFormattingContext::Geometry::usedBaselineForCell):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingState.h (modified) (1 diff)
• layout/LayoutState.h (modified) (1 diff)
• layout/tableformatting/TableFormattingContextGeometry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] FormattingState should never be copied.
+        https://bugs.webkit.org/show_bug.cgi?id=216833
+
+        Reviewed by Antti Koivisto.
+
+        Even when running a throw-away layout, we should not copy the state object but instead generate a new one for the subtree.
+        These objects should never be copied in general.
+
+        * layout/FormattingState.h:
+        * layout/LayoutState.h:
+        * layout/tableformatting/TableFormattingContextGeometry.cpp:
+        (WebCore::Layout::TableFormattingContext::Geometry::usedBaselineForCell):
+
 2020-09-22  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/layout/FormattingState.h

@@ -41 +41 @@
 
 class FormattingState {
+    WTF_MAKE_NONCOPYABLE(FormattingState);
     WTF_MAKE_ISO_ALLOCATED(FormattingState);
 public:

trunk/Source/WebCore/layout/LayoutState.h

@@ -47 +47 @@
 
 class LayoutState : public CanMakeWeakPtr<LayoutState> {
+    WTF_MAKE_NONCOPYABLE(LayoutState);
     WTF_MAKE_ISO_ALLOCATED(LayoutState);
 public:

trunk/Source/WebCore/layout/tableformatting/TableFormattingContextGeometry.cpp

@@ -150 +150 @@
     for (auto& cellDescendant : descendantsOfType<ContainerBox>(cellBox)) {
         if (cellDescendant.establishesInlineFormattingContext()) {
-            auto inlineFormattingStateForCell = layoutState().establishedInlineFormattingState(cellDescendant);
+            auto& inlineFormattingStateForCell = layoutState().establishedInlineFormattingState(cellDescendant);
             if (!inlineFormattingStateForCell.lines().isEmpty())
                 return inlineFormattingStateForCell.lines()[0].baseline();