[webkit-changes] [WebKit/WebKit] ee31ef: [LFC][Floating] FloatingState::FloatItem should be...

Alan Baradlay noreply at github.com
Thu May 4 13:06:18 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: ee31ef4315c19c1cd0aa2d2bcfc8f7c0070cfaf4
      https://github.com/WebKit/WebKit/commit/ee31ef4315c19c1cd0aa2d2bcfc8f7c0070cfaf4
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-05-04 (Thu, 04 May 2023)

  Changed paths:
    M Source/WebCore/layout/floats/FloatingContext.cpp
    M Source/WebCore/layout/floats/FloatingState.cpp
    M Source/WebCore/layout/floats/FloatingState.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

  Log Message:
  -----------
  [LFC][Floating] FloatingState::FloatItem should be able to tell where the float box is
https://bugs.webkit.org/show_bug.cgi?id=256261

Reviewed by Antti Koivisto.

This is in preparation for InlineFormattingContext set the geometry on the float box after line layout (and not during line layout in LineBuilder).
(LineBuilder returns a list of placed floats (FloatItems))

* Source/WebCore/layout/floats/FloatingContext.cpp:
(WebCore::Layout::areFloatsHorizontallySorted):
(WebCore::Layout::FloatingContext::positionForFloat const):
(WebCore::Layout::FloatingContext::bottom const):
(WebCore::Layout::FloatingContext::top const):
(WebCore::Layout::FloatingContext::constraints const):
(WebCore::Layout::FloatingContext::toFloatItem const):
(WebCore::Layout::FloatingContext::findPositionForFormattingContextRoot const):
(WebCore::Layout::FloatPair::intersects const):
(WebCore::Layout::FloatPair::horizontalConstraints const):
(WebCore::Layout::FloatPair::bottom const):
(WebCore::Layout::Iterator::operator++):
(WebCore::Layout::Iterator::set):
* Source/WebCore/layout/floats/FloatingState.cpp:
(WebCore::Layout::FloatingState::FloatItem::FloatItem):
(WebCore::Layout::FloatingState::FloatItem::absoluteRectWithMargin const):
(WebCore::Layout::FloatingState::FloatItem::absoluteBorderBoxRect const):
(WebCore::Layout::FloatingState::append):
* Source/WebCore/layout/floats/FloatingState.h:
(WebCore::Layout::FloatingState::FloatItem::boxGeometry const):
(WebCore::Layout::FloatingState::FloatItem::horizontalMargin const):
(WebCore::Layout::FloatingState::FloatItem::absoluteBottom const):
(WebCore::Layout::FloatingState::FloatItem::rectWithMargin const): Deleted.
(WebCore::Layout::FloatingState::FloatItem::borderBoxRect const): Deleted.
(WebCore::Layout::FloatingState::FloatItem::bottom const): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::prepareFloatingState):

Canonical link: https://commits.webkit.org/263690@main




More information about the webkit-changes mailing list