[webkit-changes] [WebKit/WebKit] 30cdeb: [LFC][FLoats][Cleanup] Rename FloatingState to Pla...

[Alan Baradlay]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 30cdebf9c282a12d894cf66a786279cfc6162c74
      https://github.com/WebKit/WebKit/commit/30cdebf9c282a12d894cf66a786279cfc6162c74
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-10-02 (Mon, 02 Oct 2023)

  Changed paths:
    M Source/WebCore/Headers.cmake
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/layout/floats/FloatingContext.cpp
    M Source/WebCore/layout/floats/FloatingContext.h
    R Source/WebCore/layout/floats/FloatingState.cpp
    R Source/WebCore/layout/floats/FloatingState.h
    A Source/WebCore/layout/floats/PlacedFloats.cpp
    A Source/WebCore/layout/floats/PlacedFloats.h
    M Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingState.h
    M Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h
    M Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp
    M Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineContentBalancer.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h
    M Source/WebCore/layout/formattingContexts/inline/LineLayoutResult.h
    M Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.cpp
    M Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.h
    M Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.h

  Log Message:
  -----------
  [LFC][FLoats][Cleanup] Rename FloatingState to PlacedFloats (and FloatingState:FloatItem to PlacedFloats::Item)
https://bugs.webkit.org/show_bug.cgi?id=262461

Reviewed by Antti Koivisto.

Stop using "state" for persistent content.

* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/layout/floats/FloatingContext.cpp:
(WebCore::Layout::begin):
(WebCore::Layout::end):
(WebCore::Layout::areFloatsHorizontallySorted):
(WebCore::Layout::findAvailablePosition):
(WebCore::Layout::FloatingContext::FloatingContext):
(WebCore::Layout::FloatingContext::positionForFloat const):
(WebCore::Layout::FloatingContext::positionForNonFloatingFloatAvoider const):
(WebCore::Layout::FloatingContext::verticalPositionWithClearance const):
(WebCore::Layout::FloatingContext::bottom const):
(WebCore::Layout::FloatingContext::top const):
(WebCore::Layout::FloatingContext::constraints const):
(WebCore::Layout::FloatingContext::makeFloatItem const):
(WebCore::Layout::FloatingContext::findPositionForFormattingContextRoot const):
(WebCore::Layout::FloatingContext::absoluteCoordinates const):
(WebCore::Layout::FloatingContext::mapTopLeftToPlacedFloatsRoot const):
(WebCore::Layout::FloatingContext::mapPointFromFormattingContextRootToPlacedFloatsRoot const):
(WebCore::Layout::FloatingContext::isLogicalLeftPositioned const):
(WebCore::Layout::FloatingContext::isFloatingCandidateLeftPositionedInPlacedFloats const):
(WebCore::Layout::FloatingContext::clearInPlacedFloats const):
(WebCore::Layout::FloatPair::FloatPair):
(WebCore::Layout::FloatPair::left const):
(WebCore::Layout::FloatPair::right const):
(WebCore::Layout::Iterator::Iterator):
(WebCore::Layout::previousFloatingIndex):
(WebCore::Layout::FloatingContext::mapTopLeftToFloatingStateRoot const): Deleted.
(WebCore::Layout::FloatingContext::mapPointFromFormattingContextRootToFloatingStateRoot const): Deleted.
(WebCore::Layout::FloatingContext::isFloatingCandidateLeftPositionedInFloatingState const): Deleted.
(WebCore::Layout::FloatingContext::clearInFloatingState const): Deleted.
* Source/WebCore/layout/floats/FloatingContext.h:
(WebCore::Layout::FloatingContext::placedFloats const):
(WebCore::Layout::FloatingContext::isEmpty const):
(WebCore::Layout::FloatingContext::makeFloatItem):
(WebCore::Layout::FloatingContext::floatingState const): Deleted.
* Source/WebCore/layout/floats/PlacedFloats.cpp: Renamed from Source/WebCore/layout/floats/FloatingState.cpp.
(WebCore::Layout::PlacedFloats::FloatBox::FloatBox):
(WebCore::Layout::PlacedFloats::FloatBox::boxGeometry const):
(WebCore::Layout::PlacedFloats::PlacedFloats):
(WebCore::Layout::PlacedFloats::append):
(WebCore::Layout::PlacedFloats::FloatBox::isInFormattingContextOf const):
(WebCore::Layout::PlacedFloats::clear):
(WebCore::Layout::PlacedFloats::shrinkToFit):
* Source/WebCore/layout/floats/PlacedFloats.h: Renamed from Source/WebCore/layout/floats/FloatingState.h.
(WebCore::Layout::PlacedFloats::formattingContextRoot const):
(WebCore::Layout::PlacedFloats::FloatBox::isLeftPositioned const):
(WebCore::Layout::PlacedFloats::FloatBox::isRightPositioned const):
(WebCore::Layout::PlacedFloats::FloatBox::absoluteRectWithMargin const):
(WebCore::Layout::PlacedFloats::FloatBox::absoluteBorderBoxRect const):
(WebCore::Layout::PlacedFloats::FloatBox::horizontalMargin const):
(WebCore::Layout::PlacedFloats::FloatBox::absoluteBottom const):
(WebCore::Layout::PlacedFloats::FloatBox::shape const):
(WebCore::Layout::PlacedFloats::FloatBox::placedByLine const):
(WebCore::Layout::PlacedFloats::FloatBox::layoutBox const):
(WebCore::Layout::PlacedFloats::list const):
(WebCore::Layout::PlacedFloats::last const):
(WebCore::Layout::PlacedFloats::isEmpty const):
(WebCore::Layout::PlacedFloats::isLeftToRightDirection const):
(WebCore::Layout::PlacedFloats::setIsLeftToRightDirection):
(WebCore::Layout::PlacedFloats::hasLeftPositioned const):
(WebCore::Layout::PlacedFloats::hasRightPositioned const):
* Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp:
(WebCore::Layout::FormattingGeometry::complicatedCases const):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::layoutInFlowContent):
(WebCore::Layout::BlockFormattingContext::usedContentHeight const):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp:
(WebCore::Layout::BlockFormattingState::BlockFormattingState):
(WebCore::Layout::BlockFormattingState::shrinkToFit):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingState.h:
(WebCore::Layout::BlockFormattingState::placedFloats const):
(WebCore::Layout::BlockFormattingState::placedFloats):
(WebCore::Layout::BlockFormattingState::floatingState const): Deleted.
(WebCore::Layout::BlockFormattingState::floatingState): Deleted.
* Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h:
(WebCore::Layout::BlockLayoutState::BlockLayoutState):
(WebCore::Layout::BlockLayoutState::placedFloats):
(WebCore::Layout::BlockLayoutState::placedFloats const):
(WebCore::Layout::BlockLayoutState::floatingState): Deleted.
(WebCore::Layout::BlockLayoutState::floatingState const): Deleted.
* Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp:
* Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp:
(WebCore::Layout::FlexLayout::maxContentForFlexItem):
(WebCore::Layout::FlexLayout::hypotheticalCrossSizeForFlexItems):
* Source/WebCore/layout/formattingContexts/inline/InlineContentBalancer.cpp:
(WebCore::Layout::InlineContentBalancer::initialize):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layout):
(WebCore::Layout::InlineFormattingContext::lineLayout):
(WebCore::Layout::InlineFormattingContext::layoutFloatContentOnly):
(WebCore::Layout::InlineFormattingContext::createDisplayContentForLineFromCachedContent):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h:
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::adjustOutsideListMarkersPosition):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::floatConstrainedRect const):
(WebCore::Layout::LineBuilder::tryPlacingFloatBox):
(WebCore::Layout::LineBuilder::placedFloats):
(WebCore::Layout::LineBuilder::floatingState): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h:
(WebCore::Layout::LineBuilder::placedFloats const):
(WebCore::Layout::LineBuilder::floatingState const): Deleted.
* Source/WebCore/layout/formattingContexts/inline/LineLayoutResult.h:
* Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.cpp:
(WebCore::Layout::TextOnlySimpleLineBuilder::isEligibleForSimplifiedTextOnlyInlineLayout):
* Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.h:
* Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp:
(WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::computeIntrinsicWidthConstraints):
(WebCore::LayoutIntegration::LineLayout::layout):
(WebCore::LayoutIntegration::LineLayout::updateRenderTreePositions):
(WebCore::LayoutIntegration::LineLayout::preparePlacedFloats):
(WebCore::LayoutIntegration::LineLayout::adjustContent):
(WebCore::LayoutIntegration::LineLayout::prepareFloatingState): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.cpp:
(WebCore::LayoutIntegration::computeAdjustmentsForPagination):
* Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.h:

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